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/java/lang/natRuntime.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/java/lang/natRuntime.cc')
| -rw-r--r-- | libjava/java/lang/natRuntime.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libjava/java/lang/natRuntime.cc b/libjava/java/lang/natRuntime.cc index 300dc57..5cca1b0 100644 --- a/libjava/java/lang/natRuntime.cc +++ b/libjava/java/lang/natRuntime.cc @@ -1,6 +1,6 @@ // natRuntime.cc - Implementation of native side of Runtime class. -/* 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. @@ -21,7 +21,6 @@ details. */ #include <java/lang/Runtime.h> #include <java/lang/UnknownError.h> #include <java/lang/UnsatisfiedLinkError.h> -#include <gnu/gcj/runtime/FileDeleter.h> #include <gnu/gcj/runtime/FinalizerThread.h> #include <java/io/File.h> #include <java/util/TimeZone.h> @@ -91,18 +90,19 @@ _Jv_FindSymbolInExecutable (const char *) void +java::lang::Runtime::runFinalizationForExit () +{ + if (finalizeOnExit) + _Jv_RunAllFinalizers (); +} + +void java::lang::Runtime::exitInternal (jint status) { // Make status right for Unix. This is perhaps strange. if (status < 0 || status > 255) status = 255; - if (finalizeOnExit) - _Jv_RunAllFinalizers (); - - // Delete all files registered with File.deleteOnExit() - gnu::gcj::runtime::FileDeleter::deleteOnExitNow (); - ::exit (status); } |