Mercurial > hg > openjdk > jdk6 > jdk

changeset 1767:8ca1f04d5388

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8190266: closed/java/awt/ComponentOrientation/WindowTest.java throws java.util.MissingResourceException. Reviewed-by: naoto, serb
author rpatil
date Fri, 24 Nov 2017 11:28:12 -0800
parents 5d5eeba33329
children d4387e13f0f4
files src/share/classes/java/awt/Toolkit.java src/share/classes/java/awt/Window.java
diffstat 2 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/java/awt/Toolkit.java	Mon Oct 02 14:20:37 2017 +0100
+++ b/src/share/classes/java/awt/Toolkit.java	Fri Nov 24 11:28:12 2017 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 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
@@ -1618,7 +1618,9 @@
                 try {
                     resources =
                         ResourceBundle.getBundle("sun.awt.resources.awt",
-                                                 CoreResourceBundleControl.getRBControlInstance());
+                                Locale.getDefault(),
+                                ClassLoader.getSystemClassLoader(),
+                                CoreResourceBundleControl.getRBControlInstance());
                 } catch (MissingResourceException e) {
                     // No resource file; defaults will be used.
                 }
--- a/src/share/classes/java/awt/Window.java	Mon Oct 02 14:20:37 2017 +0100
+++ b/src/share/classes/java/awt/Window.java	Fri Nov 24 11:28:12 2017 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 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
@@ -2624,7 +2624,9 @@
      */
     @Deprecated
     public void applyResourceBundle(String rbName) {
-        applyResourceBundle(ResourceBundle.getBundle(rbName));
+        applyResourceBundle(ResourceBundle.getBundle(rbName,
+                                Locale.getDefault(),
+                                ClassLoader.getSystemClassLoader()));
     }
 
    /*