# HG changeset patch
# User kaddepalli
# Date 1520596608 -19800
# Node ID e73047247fe1753a28279ecd2a1cb6e0b615dae2
# Parent  f942a873a53e2725c639566d42bbcc95b1ebc81d
8197785: javax.accessibility.AccessibleBundle will reload the ResourceBundle for every call to toDisplayString
Reviewed-by: serb, prr, ssadetsky

diff -r f942a873a53e -r e73047247fe1 src/java.desktop/share/classes/javax/accessibility/AccessibleBundle.java
--- a/src/java.desktop/share/classes/javax/accessibility/AccessibleBundle.java	Thu Mar 08 12:35:10 2018 -0800
+++ b/src/java.desktop/share/classes/javax/accessibility/AccessibleBundle.java	Fri Mar 09 17:26:48 2018 +0530
@@ -145,7 +145,7 @@
      */
     private void loadResourceBundle(String resourceBundleName,
                                     Locale locale) {
-        if (! table.contains(locale)) {
+        if (! table.containsKey(locale)) {
 
             try {
                 Hashtable<String, Object> resourceTable = new Hashtable<>();
diff -r f942a873a53e -r e73047247fe1 test/jdk/javax/accessibility/8197785/AccessibilityBundleMemoryLeakTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/javax/accessibility/8197785/AccessibilityBundleMemoryLeakTest.java	Fri Mar 09 17:26:48 2018 +0530
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2018, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+/**
+  * @test
+  * @bug 8197785
+  * @summary Tests if AccessibleBundle will reload the ResourceBundle for every
+  * call to toDisplayString.
+  * @run main AccessibilityBundleMemoryLeakTest
+  */
+import java.lang.reflect.Field;
+import java.util.Hashtable;
+import java.util.Locale;
+
+import javax.accessibility.AccessibleRole;
+import javax.accessibility.AccessibleBundle;
+
+public class AccessibilityBundleMemoryLeakTest extends AccessibleRole {
+    public AccessibilityBundleMemoryLeakTest() {
+        super("");
+    }
+
+    public static void main(String... args) throws Exception {
+        AccessibilityBundleMemoryLeakTest role = new AccessibilityBundleMemoryLeakTest();
+
+        Field field = AccessibleBundle.class.getDeclaredField("table");
+        field.setAccessible(true);
+
+        final Hashtable table = (Hashtable)field.get(role);
+        Locale locale = Locale.getDefault();
+
+        role.toDisplayString();
+        Object obj = table.get(locale);
+
+        role.toDisplayString();
+        Object obj1 = table.get(locale);
+
+        if (obj != obj1) {
+            throw new RuntimeException("Test case failed: AccessibleBundle allocates new value for existing key!");
+        }
+
+        System.out.println("Test passed.");
+
+    }
+}