From 2114cdb6787393a55e2ec0b9951b90bba0752117 Mon Sep 17 00:00:00 2001 From: bryce Date: Thu, 1 Jun 2006 07:45:55 +0000 Subject: 2006-05-31 Bryce McKinlay * prims.cc (_Jv_RunMain): Use JvNewStringUTF for command-line class name, not Latin1. * gnu/java/lang/MainThread.java (run): Allow file separator char to be used in place of '.' as class-name separator. Don't chain ClassNotFoundException. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@114300 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/gnu/java/lang/MainThread.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'libjava/gnu/java') diff --git a/libjava/gnu/java/lang/MainThread.java b/libjava/gnu/java/lang/MainThread.java index c35359f0e5a..470de0c3a68 100644 --- a/libjava/gnu/java/lang/MainThread.java +++ b/libjava/gnu/java/lang/MainThread.java @@ -39,6 +39,7 @@ exception statement from your version. */ package gnu.java.lang; +import java.io.File; import java.util.jar.Attributes; import java.util.jar.JarFile; @@ -91,13 +92,14 @@ final class MainThread extends Thread { try { - klass = Class.forName(klass_name, true, - ClassLoader.getSystemClassLoader()); + ClassLoader cl = ClassLoader.getSystemClassLoader(); + // Permit main class name to be specified in file-system format. + klass_name = klass_name.replace(File.separatorChar, '.'); + klass = cl.loadClass(klass_name); } catch (ClassNotFoundException x) { NoClassDefFoundError ncdfe = new NoClassDefFoundError(klass_name); - ncdfe.initCause(x); throw ncdfe; } } -- cgit v1.2.3