Mercurial > hg > openjdk > jdk9 > jdk

changeset 16949:cda91600a4bd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8177980: ResourceBundle.getBundle throws NoClassDefFoundError when fails to define a class Reviewed-by: naoto, lancea
author mchung
date Wed, 05 Apr 2017 10:55:31 -0700
parents 9289f04ddb54
children 383a04a71b36
files src/java.base/share/classes/java/util/ResourceBundle.java test/java/util/ResourceBundle/modules/casesensitive/CaseInsensitiveNameClash.java test/java/util/ResourceBundle/modules/casesensitive/src/resbundle/jdk/test/Main.java test/java/util/ResourceBundle/modules/casesensitive/src/resbundle/jdk/test/main.properties test/java/util/ResourceBundle/modules/casesensitive/src/resbundle/module-info.java
diffstat 5 files changed, 134 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/java.base/share/classes/java/util/ResourceBundle.java	Wed Apr 05 09:57:32 2017 -0400
+++ b/src/java.base/share/classes/java/util/ResourceBundle.java	Wed Apr 05 10:55:31 2017 -0700
@@ -1836,7 +1836,7 @@
                         cacheKey.setFormat(format);
                         break;
                     }
-                } catch (Exception e) {
+                } catch (LinkageError|Exception e) {
                     cacheKey.setCause(e);
                 }
             }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/java/util/ResourceBundle/modules/casesensitive/CaseInsensitiveNameClash.java	Wed Apr 05 10:55:31 2017 -0700
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 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
+ * 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 8177980
+ * @library /lib/testlibrary
+ * @modules jdk.compiler
+ * @build CompilerUtils jdk.testlibrary.ProcessTools CaseInsensitiveNameClash
+ * @run testng CaseInsensitiveNameClash
+ */
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import jdk.testlibrary.ProcessTools;
+
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+import static org.testng.Assert.*;
+
+public class CaseInsensitiveNameClash {
+
+    private static final String TEST_SRC = System.getProperty("test.src");
+
+    private static final Path SRC_DIR = Paths.get(TEST_SRC, "src");
+    private static final Path MODS_DIR = Paths.get("mods");
+
+    private static final String MODULE = "resbundle";
+    private static final String MAIN_CLASS = MODULE + "/jdk.test.Main";
+
+    /**
+     * Compiles the module used by the test
+     */
+    @BeforeTest
+    public void compileAll() throws Exception {
+        Path msrc = SRC_DIR.resolve(MODULE);
+        assertTrue(CompilerUtils.compile(msrc, MODS_DIR,
+                                         "--module-source-path", SRC_DIR.toString()));
+        Path propsFile = Paths.get("jdk", "test", "main.properties");
+        Files.copy(msrc.resolve(propsFile), MODS_DIR.resolve(MODULE).resolve(propsFile));
+    }
+
+    @Test
+    public void test() throws Exception {
+        assertTrue(ProcessTools.executeTestJava("--module-path", MODS_DIR.toString(),
+                                                "-m", MAIN_CLASS)
+                               .outputTo(System.out)
+                               .errorTo(System.out)
+                               .getExitValue() == 0);
+    }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/java/util/ResourceBundle/modules/casesensitive/src/resbundle/jdk/test/Main.java	Wed Apr 05 10:55:31 2017 -0700
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 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
+ * 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.
+ */
+
+package jdk.test;
+
+import java.util.ResourceBundle;
+
+public class Main {
+    public static void main(String[] args) throws Exception {
+        ResourceBundle bundle = ResourceBundle.getBundle("jdk.test.main");
+        if (!bundle.getString("key").equals("value")) {
+            throw new RuntimeException("Expected: value but get " + bundle.getString("key"));
+        }
+    }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/java/util/ResourceBundle/modules/casesensitive/src/resbundle/jdk/test/main.properties	Wed Apr 05 10:55:31 2017 -0700
@@ -0,0 +1,1 @@
+key=value
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/java/util/ResourceBundle/modules/casesensitive/src/resbundle/module-info.java	Wed Apr 05 10:55:31 2017 -0700
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 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
+ * 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.
+ */
+
+module resbundle {
+}