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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 0a95dd50bf9e106427b9b6d7f2dbb117bf1175aa..91f20e77135e4285de10255d4c4b53f785d7427e 100644 (file)
--- a/libjava/ChangeLog
+++ b/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

diff --git a/libjava/java/io/FileInputStream.java b/libjava/java/io/FileInputStream.java
index e5071e40e894d78df86082ca9112e19653541550..67d4842f4f8a5711f3e1ffee89b2cd3facf8db2c 100644 (file)
--- 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 d054afc2033d3a441c3946b2d1663f6e665affd6..9a0bf807202f58a3a7d213bce353b2d8986b95d4 100644 (file)
--- 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

diff --git a/libjava/java/net/PlainDatagramSocketImpl.java b/libjava/java/net/PlainDatagramSocketImpl.java
index 9a290dcd0f8320b3cb7b72ba1f9d9ce1876558fb..7076ccf31b17734794614c39cabf8091c3a92286 100644 (file)
--- a/libjava/java/net/PlainDatagramSocketImpl.java
+++ b/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)
       {

diff --git a/libjava/java/net/PlainSocketImpl.java b/libjava/java/net/PlainSocketImpl.java
index df9d4387d449a2e91f6e3dd4d323ba5db0b32327..49155d942b76f3b9822144cafddd1cc55361c969 100644 (file)
--- a/libjava/java/net/PlainSocketImpl.java
+++ b/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();
   }
 }