--- a/jdk/src/share/classes/java/io/ObjectStreamClass.java Tue Apr 30 13:55:48 2013 +0400
+++ b/jdk/src/share/classes/java/io/ObjectStreamClass.java Thu May 02 10:46:09 2013 +0200
@@ -266,9 +266,11 @@
if (cl == null) {
return null;
}
- Class<?> caller = Reflection.getCallerClass();
- if (ReflectUtil.needsPackageAccessCheck(caller.getClassLoader(), cl.getClassLoader())) {
- ReflectUtil.checkPackageAccess(cl);
+ if (System.getSecurityManager() != null) {
+ Class<?> caller = Reflection.getCallerClass();
+ if (ReflectUtil.needsPackageAccessCheck(caller.getClassLoader(), cl.getClassLoader())) {
+ ReflectUtil.checkPackageAccess(cl);
+ }
}
return cl;
}