From be17b0fcff12cbe0e14ef171ba970c8c751c3694 Mon Sep 17 00:00:00 2001
From: Warren Levy <warrenl@redhat.com>
Date: Fri, 8 Dec 2000 10:28:32 +0000
Subject: FileInputStream.java (close): Check if the fd is valid.

	* java/io/FileInputStream.java (close): Check if the fd is valid.
	* java/io/RandomAccessFile.java (close): Ditto.
	* java/net/PlainDatagramSocketImpl.java (close): Ditto.
	* java/net/PlainSocketImpl.java (close): Ditto.

From-SVN: r38131
---
 libjava/java/io/FileInputStream.java  | 7 ++-----
 libjava/java/io/RandomAccessFile.java | 3 ++-
 2 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'libjava/java/io')

diff --git a/libjava/java/io/FileInputStream.java b/libjava/java/io/FileInputStream.java
index e5071e4..67d4842 100644
--- a/libjava/java/io/FileInputStream.java
+++ b/libjava/java/io/FileInputStream.java
@@ -51,11 +51,8 @@ public class FileInputStream extends InputStream
 
   public void close() throws IOException
   {
-    if (fd == null)
-      return;
-
-    fd.close();
-    fd = null;
+    if (fd.valid())
+      fd.close();
   }
 
   protected void finalize() throws IOException
diff --git a/libjava/java/io/RandomAccessFile.java b/libjava/java/io/RandomAccessFile.java
index d054afc..9a0bf80 100644
--- a/libjava/java/io/RandomAccessFile.java
+++ b/libjava/java/io/RandomAccessFile.java
@@ -24,7 +24,8 @@ public class RandomAccessFile implements DataOutput, DataInput
 {
   public void close () throws IOException
   {
-    fd.close();
+    if (fd.valid())
+      fd.close();
   }
 
   public final FileDescriptor getFD () throws IOException
-- 
cgit v1.1