summaryrefslogtreecommitdiffstats
path: root/libjava
diff options
context:
space:
mode:
authormark <mark@138bc75d-0d04-0410-961f-82ee72b054a4>2003-01-04 00:08:11 +0000
committermark <mark@138bc75d-0d04-0410-961f-82ee72b054a4>2003-01-04 00:08:11 +0000
commit00de3a740c67fb7abfc3ee4ce9aededcf6090955 (patch)
treeb73163335cf0eded02e994e156d8857f974fa189 /libjava
parent72f84ed0993443902bed620907796696dd32cc38 (diff)
downloadppe42-gcc-00de3a740c67fb7abfc3ee4ce9aededcf6090955.tar.gz
ppe42-gcc-00de3a740c67fb7abfc3ee4ce9aededcf6090955.zip
* java/io/FileInputStream.java (finalize): Don't explicitly
finalize FileDescriptor. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@60863 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/java/io/FileInputStream.java6
2 files changed, 8 insertions, 3 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index a26bad21fdb..7489088f422 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-03 Mark Wielaard <mark@klomp.org>
+
+ * java/io/FileInputStream.java (finalize): Don't explicitly
+ finalize FileDescriptor.
+
2003-01-03 Jeff Sturm <jsturm@one-point.com>
* configure.host (sparc*-*): Enable bytecode interpreter.
diff --git a/libjava/java/io/FileInputStream.java b/libjava/java/io/FileInputStream.java
index d7efc26db87..85d7bbe0879 100644
--- a/libjava/java/io/FileInputStream.java
+++ b/libjava/java/io/FileInputStream.java
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 1999, 2001, 2002 Free Software Foundation
+/* Copyright (C) 1998, 1999, 2001, 2002, 2003 Free Software Foundation
This file is part of libgcj.
@@ -61,8 +61,8 @@ public class FileInputStream extends InputStream
protected void finalize() throws IOException
{
- if (fd != null)
- fd.finalize();
+ // We don't actually need this, but we include it because it is
+ // mentioned in the JCL.
}
public final FileDescriptor getFD() throws IOException
OpenPOWER on IntegriCloud