# HG changeset patch
# User dfuchs
# Date 1367362161 -7200
# Node ID 5d5752746305eeb6ad63685413a06684bafeb9c6
# Parent  df8e01fa4e26645fe43dc7cd281f2a3a45bcaef3
8012243: about 30% regression on specjvm2008.serial on 7u25 comparing 7u21
Reviewed-by: alanb, skoivu, smarks, mchung

diff -r df8e01fa4e26 -r 5d5752746305 src/share/classes/java/io/ObjectStreamClass.java
--- a/src/share/classes/java/io/ObjectStreamClass.java	Mon Apr 15 14:15:21 2013 +0400
+++ b/src/share/classes/java/io/ObjectStreamClass.java	Wed May 01 00:49:21 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;
     }
diff -r df8e01fa4e26 -r 5d5752746305 src/share/classes/java/io/ObjectStreamField.java
--- a/src/share/classes/java/io/ObjectStreamField.java	Mon Apr 15 14:15:21 2013 +0400
+++ b/src/share/classes/java/io/ObjectStreamField.java	Wed May 01 00:49:21 2013 +0200
@@ -162,9 +162,11 @@
      */
     @CallerSensitive
     public Class<?> getType() {
-        Class<?> caller = Reflection.getCallerClass();
-        if (ReflectUtil.needsPackageAccessCheck(caller.getClassLoader(), type.getClassLoader())) {
-            ReflectUtil.checkPackageAccess(type);
+        if (System.getSecurityManager() != null) {
+            Class<?> caller = Reflection.getCallerClass();
+            if (ReflectUtil.needsPackageAccessCheck(caller.getClassLoader(), type.getClassLoader())) {
+                ReflectUtil.checkPackageAccess(type);
+            }
         }
         return type;
     }