--- old/src/share/classes/java/util/TimeZone.java	Mon Sep  2 16:36:27 2013
+++ new/src/share/classes/java/util/TimeZone.java	Mon Sep  2 16:36:26 2013
@@ -728,9 +728,7 @@
     private static TimeZone getDefaultInAppContext() {
         // JavaAWTAccess provides access implementation-private methods without using reflection.
         JavaAWTAccess javaAWTAccess = SharedSecrets.getJavaAWTAccess();
-        if (javaAWTAccess == null) {
-            return mainAppContextDefault;
-        } else {
+        if (System.getSecurityManager() != null && javaAWTAccess != null) {
             if (!javaAWTAccess.isDisposed()) {
                 TimeZone tz = (TimeZone)
                     javaAWTAccess.get(TimeZone.class);
@@ -739,9 +737,12 @@
                 } else {
                     return tz;
                 }
+            } else {
+                return null;
             }
+        } else {
+            return mainAppContextDefault;
         }
-        return null;
     }
 
     /**
@@ -758,9 +759,7 @@
     private static void setDefaultInAppContext(TimeZone tz) {
         // JavaAWTAccess provides access implementation-private methods without using reflection.
         JavaAWTAccess javaAWTAccess = SharedSecrets.getJavaAWTAccess();
-        if (javaAWTAccess == null) {
-            mainAppContextDefault = tz;
-        } else {
+        if (System.getSecurityManager() != null && javaAWTAccess != null) {
             if (!javaAWTAccess.isDisposed()) {
                 javaAWTAccess.put(TimeZone.class, tz);
                 if (javaAWTAccess.isMainAppContext()) {
@@ -767,6 +766,8 @@
                     mainAppContextDefault = null;
                 }
             }
+        } else {
+            mainAppContextDefault = tz;
         }
     }