changeset 16605:c5a48effbe68

8167063: spurious message "A JNI error has occurred" if start-class cannot be initialized Reviewed-by: alanb, ksrini
author rpatil
date Wed, 01 Feb 2017 18:18:59 +0530
parents 8613f82fab04
children 9c0802c92d6b
files src/java.base/share/classes/sun/launcher/LauncherHelper.java src/java.base/share/classes/sun/launcher/resources/launcher.properties test/tools/launcher/LauncherMessageTest.java
diffstat 3 files changed, 162 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/src/java.base/share/classes/sun/launcher/LauncherHelper.java	Wed Feb 01 15:12:03 2017 +0530
+++ b/src/java.base/share/classes/sun/launcher/LauncherHelper.java	Wed Feb 01 18:18:59 2017 +0530
@@ -581,12 +581,18 @@
         }
 
         // load the class from the module
-        Class<?> c = Class.forName(m, mainClass);
-        if (c == null &&  System.getProperty("os.name", "").contains("OS X")
-                && Normalizer.isNormalized(mainClass, Normalizer.Form.NFD)) {
+        Class<?> c = null;
+        try {
+            c = Class.forName(m, mainClass);
+            if (c == null && System.getProperty("os.name", "").contains("OS X")
+                    && Normalizer.isNormalized(mainClass, Normalizer.Form.NFD)) {
 
-            String cn = Normalizer.normalize(mainClass, Normalizer.Form.NFC);
-            c = Class.forName(m, cn);
+                String cn = Normalizer.normalize(mainClass, Normalizer.Form.NFC);
+                c = Class.forName(m, cn);
+            }
+        } catch (LinkageError le) {
+            abort(null, "java.launcher.module.error3",
+                    mainClass, m.getName(), le.getLocalizedMessage());
         }
         if (c == null) {
             abort(null, "java.launcher.module.error2", mainClass, mainModule);
@@ -619,23 +625,27 @@
         Class<?> mainClass = null;
         ClassLoader scl = ClassLoader.getSystemClassLoader();
         try {
-            mainClass = Class.forName(cn, false, scl);
-        } catch (NoClassDefFoundError | ClassNotFoundException cnfe) {
-            if (System.getProperty("os.name", "").contains("OS X")
-                    && Normalizer.isNormalized(cn, Normalizer.Form.NFD)) {
-                try {
-                    // On Mac OS X since all names with diacritical marks are
-                    // given as decomposed it is possible that main class name
-                    // comes incorrectly from the command line and we have
-                    // to re-compose it
-                    String ncn = Normalizer.normalize(cn, Normalizer.Form.NFC);
-                    mainClass = Class.forName(ncn, false, scl);
-                } catch (NoClassDefFoundError | ClassNotFoundException cnfe1) {
+            try {
+                mainClass = Class.forName(cn, false, scl);
+            } catch (NoClassDefFoundError | ClassNotFoundException cnfe) {
+                if (System.getProperty("os.name", "").contains("OS X")
+                        && Normalizer.isNormalized(cn, Normalizer.Form.NFD)) {
+                    try {
+                        // On Mac OS X since all names with diacritical marks are
+                        // given as decomposed it is possible that main class name
+                        // comes incorrectly from the command line and we have
+                        // to re-compose it
+                        String ncn = Normalizer.normalize(cn, Normalizer.Form.NFC);
+                        mainClass = Class.forName(ncn, false, scl);
+                    } catch (NoClassDefFoundError | ClassNotFoundException cnfe1) {
+                        abort(cnfe1, "java.launcher.cls.error1", cn);
+                    }
+                } else {
                     abort(cnfe, "java.launcher.cls.error1", cn);
                 }
-            } else {
-                abort(cnfe, "java.launcher.cls.error1", cn);
             }
+        } catch (LinkageError le) {
+            abort(le, "java.launcher.cls.error6", cn, le.getLocalizedMessage());
         }
         return mainClass;
     }
--- a/src/java.base/share/classes/sun/launcher/resources/launcher.properties	Wed Feb 01 15:12:03 2017 +0530
+++ b/src/java.base/share/classes/sun/launcher/resources/launcher.properties	Wed Feb 01 18:18:59 2017 +0530
@@ -189,6 +189,9 @@
     or a JavaFX application class must extend {1}
 java.launcher.cls.error5=\
     Error: JavaFX runtime components are missing, and are required to run this application
+java.launcher.cls.error6=\
+    Error: LinkageError occurred while loading main class {0}\n\
+    \t{1}
 java.launcher.jar.error1=\
     Error: An unexpected error occurred while trying to open file {0}
 java.launcher.jar.error2=manifest not found in {0}
@@ -201,3 +204,7 @@
     module {0} does not have a MainClass attribute, use -m <module>/<main-class>
 java.launcher.module.error2=\
     Error: Could not find or load main class {0} in module {1}
+java.launcher.module.error3=\
+    Error: Unable to load main class {0} from module {1}\n\
+    \t{2}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/tools/launcher/LauncherMessageTest.java	Wed Feb 01 18:18:59 2017 +0530
@@ -0,0 +1,126 @@
+/*
+ * 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 8167063
+ * @library /lib/testlibrary
+ * @build jdk.testlibrary.FileUtils
+ * @run main LauncherMessageTest
+ * @summary LauncherHelper should not throw JNI error for LinkageError
+ */
+import java.io.File;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.List;
+import jdk.testlibrary.FileUtils;
+
+public class LauncherMessageTest {
+
+    public static void main(String[] args) throws Exception {
+        String userDir = System.getProperty("user.dir", ".");
+        File testDir = new File(userDir, "test");
+        List<String> srcContent = new ArrayList<>();
+
+        // Try to create a test directory before proceeding further
+        if (!testDir.mkdir()) {
+            throw new Exception("Test failed: unable to create"
+                    + " writable working directory "
+                    + testDir.getAbsolutePath());
+        }
+
+        // Create test sub-directories for sources, classes and modules respectively
+        File srcA = new File(testDir.getPath(), "srcA");
+        srcA.mkdir();
+        File srcB = new File(testDir.getPath(), "srcB");
+        srcB.mkdir();
+        File classesA = new File(testDir.getPath(), "classesA");
+        classesA.mkdir();
+        File classesB = new File(testDir.getPath(), "classesB");
+        classesB.mkdir();
+        File modules = new File(testDir.getPath(), "modules");
+        modules.mkdir();
+
+        // Define content and create module-info.java and corresponding source files
+        File modAinfo = new File(srcA.getPath(), "module-info.java");
+        srcContent.add("module mod.a { exports pkgA; }");
+        TestHelper.createFile(modAinfo, srcContent);
+
+        File classA = new File(srcA.getPath(), "ClassA.java");
+        srcContent.clear();
+        srcContent.add("package pkgA; public class ClassA { }");
+        TestHelper.createFile(classA, srcContent);
+
+        File modBinfo = new File(srcB.getPath(), "module-info.java");
+        srcContent.clear();
+        srcContent.add("module mod.b { requires mod.a; }");
+        TestHelper.createFile(modBinfo, srcContent);
+
+        File classB = new File(srcB.getPath(), "ClassB.java");
+        srcContent.clear();
+        srcContent.add("package pkgB;");
+        srcContent.add("import pkgA.ClassA;");
+        srcContent.add("public class ClassB extends ClassA {");
+        srcContent.add("public static void main(String[] args) { } }");
+        TestHelper.createFile(classB, srcContent);
+
+        // Compile all source files and create Jars
+        TestHelper.compile("-d", classesA.getPath(), classA.getPath(), modAinfo.getPath());
+        TestHelper.createJar("cf", Paths.get(modules.getPath(), "mod.a.jar").toString(),
+                "-C", classesA.getPath(), ".");
+        TestHelper.compile("-d", classesB.getPath(), "--module-path", modules.getPath(),
+                classB.getPath(), modBinfo.getPath());
+        TestHelper.createJar("cf", Paths.get(modules.getPath(), "mod.b.jar").toString(),
+                "-C", classesB.getPath(), ".");
+
+        // Delete the module-info.java and Jar file corresponding to mod.a
+        FileUtils.deleteFileWithRetry(Paths.get(modAinfo.getPath()));
+        FileUtils.deleteFileWithRetry(Paths.get(modules.getPath(), "mod.a.jar"));
+
+        // Re-create module-info.java (by removing "exports pkgA;")
+        // and corresponding Jar file
+        srcContent.clear();
+        srcContent.add("module mod.a { }");
+        TestHelper.createFile(modAinfo, srcContent);
+        TestHelper.compile("-d", classesA.getPath(), classA.getPath(), modAinfo.getPath());
+        TestHelper.createJar("cf", Paths.get(modules.getPath(), "mod.a.jar").toString(),
+                "-C", classesA.getPath(), ".");
+
+        // Execute the main class
+        String[] commands = {TestHelper.javaCmd, "--module-path", modules.getPath(),
+            "-m", "mod.b/pkgB.ClassB"};
+        TestHelper.TestResult result = TestHelper.doExec(commands);
+
+        // Clean the test directory and check test status
+        FileUtils.deleteFileTreeWithRetry(Paths.get(testDir.getPath()));
+        if (result.isOK()) {
+            throw new Exception("Test Passed Unexpectedly!");
+        } else {
+            result.testOutput.forEach(System.err::println);
+            if (result.contains("JNI error")) {
+                throw new Exception("Test Failed with JNI error!");
+            }
+        }
+        System.out.println("Test passes, failed with expected error message");
+    }
+}