changeset 9862:b651c4342099

Merge
author asaha
date Thu, 05 Jun 2014 15:28:05 -0700
parents 31cb58131142 4615b5d3480e
children 2ef32f0aa8d7 7c50c0145f5f
files .hgtags
diffstat 2 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Jun 05 15:22:19 2014 -0700
+++ b/.hgtags	Thu Jun 05 15:28:05 2014 -0700
@@ -301,3 +301,4 @@
 d723d05cd17afd5c4dd4293bcba83fef44a3c0bb jdk8u20-b16
 31433e5da5bcfd107381f281058dc80377f04d23 jdk8u20-b17
 abca9f6f1a10e9f91b2538bbe7870f54f550d986 jdk8u25-b00
+7d0627679c9fdeaaaa9fe15c7cc11af0763621ec jdk8u25-b01
--- a/src/share/classes/java/util/logging/LogRecord.java	Thu Jun 05 15:22:19 2014 -0700
+++ b/src/share/classes/java/util/logging/LogRecord.java	Thu Jun 05 15:28:05 2014 -0700
@@ -513,7 +513,13 @@
         // If necessary, try to regenerate the resource bundle.
         if (resourceBundleName != null) {
             try {
-                resourceBundle = ResourceBundle.getBundle(resourceBundleName);
+                // use system class loader to ensure the ResourceBundle
+                // instance is a different instance than null loader uses
+                final ResourceBundle bundle =
+                        ResourceBundle.getBundle(resourceBundleName,
+                                Locale.getDefault(),
+                                ClassLoader.getSystemClassLoader());
+                resourceBundle = bundle;
             } catch (MissingResourceException ex) {
                 // This is not a good place to throw an exception,
                 // so we simply leave the resourceBundle null.