From 2d2d0877ca0d5477ec0100aed0934bf35f5a20c1 Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mark@klomp.org>
Date: Sat, 4 Jan 2003 00:08:11 +0000
Subject: [PATCH] FileInputStream.java (finalize): Don't explicitly finalize
FileDescriptor.
* java/io/FileInputStream.java (finalize): Don't explicitly
finalize FileDescriptor.
From-SVN: r60863
---
libjava/ChangeLog | 5 +++++
libjava/java/io/FileInputStream.java | 6 +++---
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index a26bad21fdbe..7489088f422e 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 d7efc26db87d..85d7bbe0879f 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
--
GitLab