6758881: (launcher) needs to throw NoClassDefFoundError instead of JavaRuntimeException

Summary: The launcher will throw the Error vs. Exception, also fixed some minor issues with the tests.
Reviewed-by: darcy

1 files changed, 5 insertions, 3 deletions

diff --git a/src/share/classes/sun/launcher/LauncherHelper.java b/src/share/classes/sun/launcher/LauncherHelper.java
index 8cca710da..3951bcfeb 100644
--- a/src/share/classes/sun/launcher/LauncherHelper.java
+++ b/src/share/classes/sun/launcher/LauncherHelper.java
@@ -176,10 +176,10 @@ public enum LauncherHelper {
      * @param isJar
      * @param name
      * @return
-     * @throws java.lang.Exception
+     * @throws java.io.IOException
      */
     public static Object checkAndLoadMain(boolean printToStderr,
-            boolean isJar, String name) throws Exception {
+            boolean isJar, String name) throws IOException {
         // get the class name
         String classname = (isJar) ? getMainClassFromJar(name) : name;
         classname = classname.replace('/', '.');
@@ -190,7 +190,9 @@ public enum LauncherHelper {
             clazz = loader.loadClass(classname);
         } catch (ClassNotFoundException cnfe) {
             ostream.println(getLocalizedMessage("java.launcher.cls.error1", classname));
-            throw new RuntimeException("Could not find the main class " + classname);
+            NoClassDefFoundError ncdfe = new NoClassDefFoundError(classname);
+            ncdfe.initCause(cnfe);
+            throw ncdfe;
         }
         signatureDiagnostic(ostream, clazz);
         return clazz;