stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8336300: DateFormatSymbols#getInstanceRef returns non-cached instance

Browse Source 
Reviewed-by: joehw, iris, jlu, aturbanov
This commit is contained in:
Naoto Sato 2024-07-17 16:25:36 +00:00
parent 7ec55df34a
commit 10186ff48f
2 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/java.base/share/classes/java/text/DateFormatSymbols.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -351,20 +351,6 @@ public class DateFormatSymbols implements Serializable, Cloneable {
throw new RuntimeException("DateFormatSymbols instance creation failed."); throw new RuntimeException("DateFormatSymbols instance creation failed.");
} }
/**
* Returns a DateFormatSymbols provided by a provider or found in
* the cache. Note that this method returns a cached instance,
* not its clone. Therefore, the instance should never be given to
* an application.
*/
static final DateFormatSymbols getInstanceRef(Locale locale) {
DateFormatSymbols dfs = getProviderInstance(locale);
if (dfs != null) {
return dfs;
}
throw new RuntimeException("DateFormatSymbols instance creation failed.");
}
private static DateFormatSymbols getProviderInstance(Locale locale) { private static DateFormatSymbols getProviderInstance(Locale locale) {
LocaleProviderAdapter adapter = LocaleProviderAdapter.getAdapter(DateFormatSymbolsProvider.class, locale); LocaleProviderAdapter adapter = LocaleProviderAdapter.getAdapter(DateFormatSymbolsProvider.class, locale);
DateFormatSymbolsProvider provider = adapter.getDateFormatSymbolsProvider(); DateFormatSymbolsProvider provider = adapter.getDateFormatSymbolsProvider();

4
src/java.base/share/classes/java/text/SimpleDateFormat.java
View File

@ -623,7 +623,7 @@ public class SimpleDateFormat extends DateFormat {
initializeCalendar(locale); initializeCalendar(locale);
this.pattern = pattern; this.pattern = pattern;
this.formatData = DateFormatSymbols.getInstanceRef(locale); formatData = DateFormatSymbols.getInstance(locale);
this.locale = locale; this.locale = locale;
initialize(locale); initialize(locale);
} }
@ -644,7 +644,7 @@ public class SimpleDateFormat extends DateFormat {
} }
this.pattern = pattern; this.pattern = pattern;
this.formatData = (DateFormatSymbols) formatSymbols.clone(); formatData = (DateFormatSymbols) formatSymbols.clone();
this.locale = Locale.getDefault(Locale.Category.FORMAT); this.locale = Locale.getDefault(Locale.Category.FORMAT);
initializeCalendar(this.locale); initializeCalendar(this.locale);
initialize(this.locale); initialize(this.locale);