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/io | |
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/io')
-rw-r--r-- | libjava/java/io/File.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libjava/java/io/File.java b/libjava/java/io/File.java index e3d59cb..1b02b60 100644 --- a/libjava/java/io/File.java +++ b/libjava/java/io/File.java @@ -1,5 +1,5 @@ /* File.java -- Class representing a file on disk - Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005 + Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -44,7 +44,6 @@ import java.net.URI; import java.net.URISyntaxException; import java.net.URL; import gnu.classpath.Configuration; -import gnu.gcj.runtime.FileDeleter; /* Written using "Java Class Libraries", 2nd edition, ISBN 0-201-31002-3 * "The Java Language Specification", ISBN 0-201-63451-1 @@ -1375,7 +1374,7 @@ public class File implements Serializable, Comparable if (sm != null) sm.checkDelete (getName()); - FileDeleter.add (this); + DeleteFileHelper.add(this); } private void writeObject(ObjectOutputStream oos) throws IOException |