src/share/classes/java/util/TimeZone.java

Print this page

        

*** 726,741 **** * This works around a build time issue. */ private static TimeZone getDefaultInAppContext() { // JavaAWTAccess provides access implementation-private methods without using reflection. JavaAWTAccess javaAWTAccess = SharedSecrets.getJavaAWTAccess(); ! if (javaAWTAccess == null) { return mainAppContextDefault; } else { ! if (!javaAWTAccess.isDisposed()) { ! TimeZone tz = (TimeZone) ! javaAWTAccess.get(TimeZone.class); if (tz == null && javaAWTAccess.isMainAppContext()) { return mainAppContextDefault; } else { return tz; } --- 726,742 ---- * This works around a build time issue. */ private static TimeZone getDefaultInAppContext() { // JavaAWTAccess provides access implementation-private methods without using reflection. JavaAWTAccess javaAWTAccess = SharedSecrets.getJavaAWTAccess(); ! if (System.getSecurityManager() == null || javaAWTAccess == null) { return mainAppContextDefault; + } else if (javaAWTAccess != null) { + if (javaAWTAccess.isDisposed()) { + return null; } else { ! TimeZone tz = (TimeZone) javaAWTAccess.get(TimeZone.class); if (tz == null && javaAWTAccess.isMainAppContext()) { return mainAppContextDefault; } else { return tz; }
*** 756,775 **** * This works around a build time issue. */ 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 (!javaAWTAccess.isDisposed()) { javaAWTAccess.put(TimeZone.class, tz); if (javaAWTAccess.isMainAppContext()) { mainAppContextDefault = null; } } - } } /** * Returns true if this zone has the same rule and offset as another zone. * That is, if this zone differs only in ID, if at all. Returns false --- 757,774 ---- * This works around a build time issue. */ private static void setDefaultInAppContext(TimeZone tz) { // JavaAWTAccess provides access implementation-private methods without using reflection. JavaAWTAccess javaAWTAccess = SharedSecrets.getJavaAWTAccess(); ! if (System.getSecurityManager() == null || javaAWTAccess == null) { mainAppContextDefault = tz; ! } else if (javaAWTAccess != null && !javaAWTAccess.isDisposed()) { javaAWTAccess.put(TimeZone.class, tz); if (javaAWTAccess.isMainAppContext()) { mainAppContextDefault = null; } } } /** * Returns true if this zone has the same rule and offset as another zone. * That is, if this zone differs only in ID, if at all. Returns false