aboutsummaryrefslogtreecommitdiffstats
path: root/plugin/icedteanp/java/sun/applet
diff options
context:
space:
mode:
Diffstat (limited to 'plugin/icedteanp/java/sun/applet')
-rw-r--r--plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java b/plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java
index 697833d..cef0ac9 100644
--- a/plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java
+++ b/plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java
@@ -522,8 +522,9 @@ public class PluginAppletSecurityContext {
Integer index = parseCall(args[1], null, Integer.class);
Object ret = store.getObject(index);
+ Class<?> retClass = ret != null ? ret.getClass() : null;
- String objIDStr = toObjectIDString(ret, ret.getClass(), true /*unbox primitives*/);
+ String objIDStr = toObjectIDString(ret, retClass, true /*unbox primitives*/);
write(reference, "GetValue " + objIDStr);
} else if (message.startsWith("SetStaticField") ||
message.startsWith("SetField")) {