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/ChangeLog

@@ -1,3 +1,10 @@
+2000-12-08  Warren Levy  <warrenl@redhat.com>
+
+	* 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.
+
 2000-12-06  Tom Tromey  <tromey@redhat.com>
 
 	* java/awt/GridBagConstraints.java: Filled in values for static

libjava/java/io/FileInputStream.java

@@ -51,11 +51,8 @@ public class FileInputStream extends InputStream
 
   public void close() throws IOException
   {
-    if (fd == null)
+    if (fd.valid())
-      return;
+      fd.close();
-
-    fd.close();
-    fd = null;
   }
 
   protected void finalize() throws IOException

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

libjava/java/net/PlainDatagramSocketImpl.java

@@ -79,7 +79,8 @@ class PlainDatagramSocketImpl extends DatagramSocketImpl
     // we'll catch the IOException here.
     try
       {
-        fd.close();
+        if (fd.valid())
+	  fd.close();
       }
     catch (IOException e)
       {

libjava/java/net/PlainSocketImpl.java

@@ -92,6 +92,7 @@ class PlainSocketImpl extends SocketImpl
 
   protected void close () throws IOException
   {
-    fd.close();
+    if (fd.valid())
+      fd.close();
   }
 }