* 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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index a26bad2..7489088 100644 (file)
--- 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 d7efc26..85d7bbe 100644 (file)
--- 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