diff options
| author | Anthony Green <green@redhat.com> | 2000-08-26 19:25:13 +0000 |
|---|---|---|
| committer | Anthony Green <green@gcc.gnu.org> | 2000-08-26 19:25:13 +0000 |
| commit | 6aaeb97551dcfaa5dbcca802782ec42dd7b4cf43 (patch) | |
| tree | ec60dfe7b11606b3c5c1d32bb2b29e9dd37d5be1 /libjava/gnu/gcj/runtime/FirstThread.java | |
| parent | 14fdf4b67e8843c870c88baac0c4974b2e67bb32 (diff) | |
Makefile.in: Rebuilt.
2000-08-26 Anthony Green <green@redhat.com>
* Makefile.in: Rebuilt.
* Makefile.am (java/lang/ClassLoader.h): Make _Jv_RunMain a
friend.
* prims.cc: Include ClassLoader.h.
(_Jv_RunMain): When executing jar files, classpath must be the jar
file only. Lose our reference to the system ClassLoader in order
to get a new one with the correct classpath.
* java/lang/natSystem.cc (init_properties): When executing a jar
file, only use the jar file for java.class.path.
* gnu/gcj/runtime/VMClassLoader.java: Use the canonical file name
for bytecode archives.
* gnu/gcj/runtime/FirstThread.java: Handle case where manifest
exists, but not Main-Class.
From-SVN: r35999
Diffstat (limited to 'libjava/gnu/gcj/runtime/FirstThread.java')
| -rw-r--r-- | libjava/gnu/gcj/runtime/FirstThread.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/libjava/gnu/gcj/runtime/FirstThread.java b/libjava/gnu/gcj/runtime/FirstThread.java index 21022250713..8cf477fad55 100644 --- a/libjava/gnu/gcj/runtime/FirstThread.java +++ b/libjava/gnu/gcj/runtime/FirstThread.java @@ -55,11 +55,15 @@ final class FirstThread extends Thread jarMainClassName = a.getValue(Attributes.Name.MAIN_CLASS); - } catch (Exception e) { - - System.err.println ("Failed to load Main-Class manifest attribute from\n" + args[0]); + if (jarMainClassName != null) + return; + } catch (Exception e) { + // empty } + + System.err.println ("Failed to load Main-Class manifest attribute from\n" + + args[0]); } // If interpreter is invoked with -jar, the main class name is recorded |