# HG changeset patch
# User naoto
# Date 1502215666 25200
# Node ID 87dbd39026554a248e8ca349bd34b9cea02d9b72
# Parent  bc9333acb2fd037bfbce4e252ebdc8d6e779ea37
8182601: Improve usage messages
Reviewed-by: alanb, ahgross, ksrini, mchung, dfuchs

diff -r bc9333acb2fd -r 87dbd3902655 src/share/classes/java/util/ResourceBundle.java
--- a/src/share/classes/java/util/ResourceBundle.java	Thu Nov 09 22:05:56 2017 +0300
+++ b/src/share/classes/java/util/ResourceBundle.java	Tue Aug 08 11:07:46 2017 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2017, 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
@@ -441,7 +441,7 @@
     }
 
     /**
-     * A wrapper of ClassLoader.getSystemClassLoader().
+     * A wrapper of Extension Class Loader
      */
     private static class RBClassLoader extends ClassLoader {
         private static final RBClassLoader INSTANCE = AccessController.doPrivileged(
@@ -450,7 +450,16 @@
                             return new RBClassLoader();
                         }
                     });
-        private static final ClassLoader loader = ClassLoader.getSystemClassLoader();
+        private static final ClassLoader loader;
+        static {
+            // Find the extension class loader.
+            ClassLoader ld = ClassLoader.getSystemClassLoader();
+            ClassLoader parent;
+            while ((parent = ld.getParent()) != null) {
+                ld = parent;
+            }
+            loader = ld;
+        }
 
         private RBClassLoader() {
         }
diff -r bc9333acb2fd -r 87dbd3902655 src/share/classes/java/util/logging/Level.java
--- a/src/share/classes/java/util/logging/Level.java	Thu Nov 09 22:05:56 2017 +0300
+++ b/src/share/classes/java/util/logging/Level.java	Tue Aug 08 11:07:46 2017 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2017, 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
diff -r bc9333acb2fd -r 87dbd3902655 src/share/classes/java/util/logging/Logger.java
--- a/src/share/classes/java/util/logging/Logger.java	Thu Nov 09 22:05:56 2017 +0300
+++ b/src/share/classes/java/util/logging/Logger.java	Tue Aug 08 11:07:46 2017 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2017, 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
@@ -1350,8 +1350,7 @@
             public ResourceBundle run() {
                 try {
                     return ResourceBundle.getBundle(SYSTEM_LOGGER_RB_NAME,
-                                                    locale,
-                                                    ClassLoader.getSystemClassLoader());
+                                                    locale);
                 } catch (MissingResourceException e) {
                     throw new InternalError(e.toString());
                 }
diff -r bc9333acb2fd -r 87dbd3902655 src/share/classes/javax/swing/UIDefaults.java
--- a/src/share/classes/javax/swing/UIDefaults.java	Thu Nov 09 22:05:56 2017 +0300
+++ b/src/share/classes/javax/swing/UIDefaults.java	Tue Aug 08 11:07:46 2017 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -307,7 +307,8 @@
                     if (c != null) {
                         b = ResourceBundle.getBundle(bundleName, l, c);
                     } else {
-                        b = ResourceBundle.getBundle(bundleName, l);
+                        b = ResourceBundle.getBundle(bundleName, l,
+                                ClassLoader.getSystemClassLoader());
                     }
                     Enumeration keys = b.getKeys();