From b5723ffcb5556c56cead327e971e9a990fcaa540 Mon Sep 17 00:00:00 2001 From: tromey Date: Fri, 6 Jan 2006 01:03:45 +0000 Subject: * 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@109400 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/prims.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libjava/prims.cc') diff --git a/libjava/prims.cc b/libjava/prims.cc index 490d2b1c127..09bca0b6f71 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 -- cgit v1.2.1