From 00b69649e8a910de55fba0c11517a680946d7ab1 Mon Sep 17 00:00:00 2001
From: rpatil <unknown>
Date: Fri, 24 Nov 2017 11:28:12 -0800
Subject: [PATCH] 8190266: closed/java/awt/ComponentOrientation/WindowTest.java
 throws java.util.MissingResourceException. Reviewed-by: naoto, serb

---
 src/share/classes/java/awt/Toolkit.java | 6 ++++--
 src/share/classes/java/awt/Window.java  | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/share/classes/java/awt/Toolkit.java b/src/share/classes/java/awt/Toolkit.java
index 5d0cfb91d..91c28f4e2 100644
--- a/src/share/classes/java/awt/Toolkit.java
+++ b/src/share/classes/java/awt/Toolkit.java
@@ -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
@@ -1656,7 +1656,9 @@ public abstract class Toolkit {
                 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.
                 }
diff --git a/src/share/classes/java/awt/Window.java b/src/share/classes/java/awt/Window.java
index 1d993b014..947c945e7 100644
--- a/src/share/classes/java/awt/Window.java
+++ b/src/share/classes/java/awt/Window.java
@@ -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
@@ -2786,7 +2786,9 @@ public class Window extends Container implements Accessible {
      */
     @Deprecated
     public void applyResourceBundle(String rbName) {
-        applyResourceBundle(ResourceBundle.getBundle(rbName));
+        applyResourceBundle(ResourceBundle.getBundle(rbName,
+                                Locale.getDefault(),
+                                ClassLoader.getSystemClassLoader()));
     }
 
    /*
-- 
GitLab