Addresses review comments

naotoj · Jan 2, 2025 · 4dac7ba · 4dac7ba
1 parent 9553ebd
commit 4dac7ba
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 59 deletions.
diff --git a/src/java.base/share/classes/java/time/format/DateTimeTextProvider.java b/src/java.base/share/classes/java/time/format/DateTimeTextProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, 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
@@ -312,8 +312,10 @@ private Object findStore(TemporalField field, Locale locale) {
         Object store = CACHE.get(key);
         if (store == null) {
             store = createStore(field, locale);
-            CACHE.putIfAbsent(key, store);
-            store = CACHE.get(key);
+            var existing = CACHE.putIfAbsent(key, store);
+            if (existing != null) {
+                store = existing;
+            }
         }
         return store;
     }

diff --git a/src/java.base/share/classes/java/time/format/DecimalStyle.java b/src/java.base/share/classes/java/time/format/DecimalStyle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, 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
@@ -163,8 +163,10 @@ public static DecimalStyle of(Locale locale) {
         DecimalStyle info = CACHE.get(locale);
         if (info == null) {
             info = create(locale);
-            CACHE.putIfAbsent(locale, info);
-            info = CACHE.get(locale);
+            var existing = CACHE.putIfAbsent(locale, info);
+            if (existing != null) {
+                info = existing;
+            }
         }
         return info;
     }

diff --git a/test/micro/org/openjdk/bench/java/time/ZoneOffsetBench.java b/test/micro/org/openjdk/bench/java/time/ZoneOffsetBench.java