diff options
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/java/lang/FirstThread.java | 11 | ||||
| -rw-r--r-- | libjava/java/lang/natFirstThread.cc | 11 |
3 files changed, 7 insertions, 20 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 906d69b..a1c94dc 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,10 @@ 1999-09-23 Tom Tromey <tromey@cygnus.com> + * java/lang/natFirstThread.cc (run): Renamed from `run0'. Removed + dead code. + * java/lang/FirstThread.java (run0): Renamed to `run'. + (run): Removed. + * prims.cc (main_init): New function. (JvRunMain): Call it. (_Jv_RunMain): Likewise. diff --git a/libjava/java/lang/FirstThread.java b/libjava/java/lang/FirstThread.java index 0dd5c9c..ea5d846 100644 --- a/libjava/java/lang/FirstThread.java +++ b/libjava/java/lang/FirstThread.java @@ -19,16 +19,7 @@ package java.lang; final class FirstThread extends Thread { - public native void run0 (); - public void run () - { - try { - run0 (); - } catch (Throwable ex) { - System.err.println ("uncaught exception at top level"); - ex.printStackTrace (); - } - } + public native void run (); public FirstThread (ThreadGroup g, Class k, Object o) { diff --git a/libjava/java/lang/natFirstThread.cc b/libjava/java/lang/natFirstThread.cc index 031779e..b0d8fff 100644 --- a/libjava/java/lang/natFirstThread.cc +++ b/libjava/java/lang/natFirstThread.cc @@ -27,20 +27,11 @@ details. */ typedef void main_func (jobject); void -java::lang::FirstThread::run0 (void) +java::lang::FirstThread::run (void) { Utf8Const* main_signature = _Jv_makeUtf8Const ("([Ljava.lang.String;)V", 22); Utf8Const* main_name = _Jv_makeUtf8Const ("main", 4); -#if 0 - // Note: this turns out to be more painful than useful. Apparently - // many people rely on being able to have main in a non-public - // class. - // This is based on my reading of 12.3.3. - if (! java::lang::reflect::Modifier::isPublic(klass->getModifiers())) - DIE ("class must be public"); -#endif - if (klass == NULL) { klass = java::lang::Class::forName (klass_name); |