diff options
| author | Tom Tromey <tromey@redhat.com> | 2006-01-06 01:03:45 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2006-01-06 01:03:45 +0000 |
| commit | 1058a848dcd220965dd4d126eb9f4159782dd586 (patch) | |
| tree | b1406d0aef45f9b54fc3cb3b56375bc3ce39b15c /libjava/prims.cc | |
| parent | 0c158c887f3669dd47297b68b1aa490f5da5b7ad (diff) | |
| download | gcc-1058a848dcd220965dd4d126eb9f4159782dd586.zip gcc-1058a848dcd220965dd4d126eb9f4159782dd586.tar.gz gcc-1058a848dcd220965dd4d126eb9f4159782dd586.tar.bz2 | |
natThread.cc (finish_): Don't clear 'group'.
* java/lang/natThread.cc (finish_): Don't clear 'group'.
* sources.am, Makefile.in: Rebuilt.
* java/lang/Runtime.java (exit): Merged with Classpath.
(runShutdownHooks): New method from Classpath.
* java/io/File.java (deleteOnExit): Use DeleteFileHelper, not
FileDeleter.
* gnu/gcj/runtime/FileDeleter.java: Removed.
* java/lang/natRuntime.cc (runFinalizationForExit): New method.
(exitInternal): Don't run finalizers or delete files.
From-SVN: r109400
Diffstat (limited to 'libjava/prims.cc')
| -rw-r--r-- | libjava/prims.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libjava/prims.cc b/libjava/prims.cc index 490d2b1..09bca0b 100644 --- a/libjava/prims.cc +++ b/libjava/prims.cc @@ -1,6 +1,6 @@ // prims.cc - Code for core of runtime environment. -/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation +/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation This file is part of libgcj. @@ -1387,10 +1387,10 @@ _Jv_RunMain (JvVMInitArgs *vm_args, jclass klass, const char *name, int argc, _Jv_AttachCurrentThread (main_thread); _Jv_ThreadRun (main_thread); - _Jv_ThreadWait (); - int status = (int) java::lang::ThreadGroup::had_uncaught_exception; - runtime->exit (status); + // If we got here then something went wrong, as MainThread is not + // supposed to terminate. + ::exit (1); } void |