Mercurial > hg > openjdk > jigsaw > jdk
changeset 6327:fecba6a8b78e
7196533: TimeZone.getDefault() slow due to synchronization bottleneck
Reviewed-by: okutsu
author | coffeys |
---|---|
date | Tue, 09 Oct 2012 12:50:52 +0100 |
parents | 92f3a96f3c78 |
children | 3b79177ebfef |
files | src/share/classes/java/util/TimeZone.java |
diffstat | 1 files changed, 14 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/java/util/TimeZone.java Mon Oct 08 10:42:43 2012 +0800 +++ b/src/share/classes/java/util/TimeZone.java Tue Oct 09 12:50:52 2012 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -719,15 +719,16 @@ * Returns the default TimeZone in an AppContext if any AppContext * has ever used. null is returned if any AppContext hasn't been * used or if the AppContext doesn't have the default TimeZone. + * + * Note that javaAWTAccess may be null if sun.awt.AppContext class hasn't + * been loaded. If so, it implies that AWTSecurityManager is not our + * SecurityManager and we can use a local static variable. + * This works around a build time issue. */ - private synchronized static TimeZone getDefaultInAppContext() { + private static TimeZone getDefaultInAppContext() { // JavaAWTAccess provides access implementation-private methods without using reflection. JavaAWTAccess javaAWTAccess = SharedSecrets.getJavaAWTAccess(); - // Note that javaAWTAccess may be null if sun.awt.AppContext class hasn't - // been loaded. If so, it implies that AWTSecurityManager is not our - // SecurityManager and we can use a local static variable. - // This works around a build time issue. if (javaAWTAccess == null) { return mainAppContextDefault; } else { @@ -749,15 +750,16 @@ * tz. null is handled special: do nothing if any AppContext * hasn't been used, remove the default TimeZone in the * AppContext otherwise. + * + * Note that javaAWTAccess may be null if sun.awt.AppContext class hasn't + * been loaded. If so, it implies that AWTSecurityManager is not our + * SecurityManager and we can use a local static variable. + * This works around a build time issue. */ - private synchronized static void setDefaultInAppContext(TimeZone tz) { + private static void setDefaultInAppContext(TimeZone tz) { // JavaAWTAccess provides access implementation-private methods without using reflection. JavaAWTAccess javaAWTAccess = SharedSecrets.getJavaAWTAccess(); - // Note that javaAWTAccess may be null if sun.awt.AppContext class hasn't - // been loaded. If so, it implies that AWTSecurityManager is not our - // SecurityManager and we can use a local static variable. - // This works around a build time issue. if (javaAWTAccess == null) { mainAppContextDefault = tz; } else { @@ -822,7 +824,7 @@ private static final int GMT_ID_LENGTH = 3; // a static TimeZone we can reference if no AppContext is in place - private static TimeZone mainAppContextDefault; + private static volatile TimeZone mainAppContextDefault; /** * Parses a custom time zone identifier and returns a corresponding zone.