8330802: Desugar switch in Locale::createLocale

Reviewed-by: alanb, liach, rriggs, naoto, mchung
openjdk · Apr 23, 2024 · daa5a4b · daa5a4b · openjdk-notifier · Apr 23, 2024
1 parent 8961077
commit daa5a4b
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/java.base/share/classes/java/util/Locale.java b/src/java.base/share/classes/java/util/Locale.java
@@ -995,11 +995,11 @@ static Locale getInstance(BaseLocale baseloc, LocaleExtensions extensions) {
 
     private static final ReferencedKeyMap<Object, Locale> LOCALE_CACHE = ReferencedKeyMap.create(true, ConcurrentHashMap::new);
     private static Locale createLocale(Object key) {
-        return switch (key) {
-            case BaseLocale base -> new Locale(base, null);
-            case LocaleKey lk -> new Locale(lk.base, lk.exts);
-            default -> throw new InternalError("should not happen");
-        };
+        if (key instanceof BaseLocale base) {
+            return new Locale(base, null);
+        }
+        LocaleKey lk = (LocaleKey)key;
+        return new Locale(lk.base, lk.exts);
     }
 
     private static final class LocaleKey {