jdk/src/share/classes/java/io/ObjectOutputStream.java
changeset 23928 b610d940a61d
parent 22936 1263cd9144d7
child 24865 09b1d992ca72
--- a/jdk/src/share/classes/java/io/ObjectOutputStream.java	Wed Apr 16 08:16:51 2014 +0100
+++ b/jdk/src/share/classes/java/io/ObjectOutputStream.java	Wed Apr 16 12:37:49 2014 +0400
@@ -1254,7 +1254,7 @@
         }
 
         bout.setBlockDataMode(true);
-        if (isCustomSubclass()) {
+        if (cl != null && isCustomSubclass()) {
             ReflectUtil.checkPackageAccess(cl);
         }
         annotateProxyClass(cl);
@@ -1283,7 +1283,7 @@
 
         Class<?> cl = desc.forClass();
         bout.setBlockDataMode(true);
-        if (isCustomSubclass()) {
+        if (cl != null && isCustomSubclass()) {
             ReflectUtil.checkPackageAccess(cl);
         }
         annotateClass(cl);