diff options
| author | Andrew Haley <aph@cygnus.com> | 2000-06-28 12:24:10 +0000 |
|---|---|---|
| committer | Andrew Haley <aph@gcc.gnu.org> | 2000-06-28 12:24:10 +0000 |
| commit | 52fa9d82f468914878c02a2a641f2b1bb55f579d (patch) | |
| tree | 5b29ccb63d57e84b533d5502d97e0f3d92ecf224 /libjava/java/io | |
| parent | 580ac503925ca3b85efd84cc3cf666ad7f659ef7 (diff) | |
| download | gcc-52fa9d82f468914878c02a2a641f2b1bb55f579d.zip gcc-52fa9d82f468914878c02a2a641f2b1bb55f579d.tar.gz gcc-52fa9d82f468914878c02a2a641f2b1bb55f579d.tar.bz2 | |
re GNATS java.io/203 (File.createTempFile doesn't close descriptor)
2000-06-27 Andrew Haley <aph@cygnus.com>
* java/io/File.java (createTempFile): Close the FileDescriptor
used to create a temp file. Fixes some of PR 203.
* java/io/natFileDescriptorPosix.cc (open): Call garbage
collection if we run out of file handles.
From-SVN: r34755
Diffstat (limited to 'libjava/java/io')
| -rw-r--r-- | libjava/java/io/File.java | 4 | ||||
| -rw-r--r-- | libjava/java/io/natFileDescriptorPosix.cc | 8 |
2 files changed, 11 insertions, 1 deletions
diff --git a/libjava/java/io/File.java b/libjava/java/io/File.java index 38bcb9f..c8aaddf 100644 --- a/libjava/java/io/File.java +++ b/libjava/java/io/File.java @@ -260,7 +260,9 @@ public class File implements Serializable String l = prefix + t.substring(t.length() - 6) + suffix; try { - desc.open (l, FileDescriptor.WRITE | FileDescriptor.EXCL); + desc = new FileDescriptor + (l, FileDescriptor.WRITE | FileDescriptor.EXCL); + desc.close (); ret.setPath(l); return ret; } diff --git a/libjava/java/io/natFileDescriptorPosix.cc b/libjava/java/io/natFileDescriptorPosix.cc index 50be35c..6e06a03 100644 --- a/libjava/java/io/natFileDescriptorPosix.cc +++ b/libjava/java/io/natFileDescriptorPosix.cc @@ -43,6 +43,7 @@ details. */ #include <java/io/EOFException.h> #include <java/lang/ArrayIndexOutOfBoundsException.h> #include <java/lang/NullPointerException.h> +#include <java/lang/System.h> #include <java/lang/String.h> #include <java/lang/Thread.h> #include <java/io/FileNotFoundException.h> @@ -105,6 +106,13 @@ java::io::FileDescriptor::open (jstring path, jint jflags) } int fd = ::open (buf, flags, mode); + if (fd == -1 && errno == EMFILE) + { + // Because finalize () calls close () we might be able to continue. + java::lang::System::gc (); + java::lang::System::runFinalization (); + fd = ::open (buf, flags, mode); + } if (fd == -1) { char msg[MAXPATHLEN + 200]; |