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/net/PlainDatagramSocketImpl.java | 3 ++-
libjava/java/net/PlainSocketImpl.java | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
(limited to 'libjava/java/net')
diff --git a/libjava/java/net/PlainDatagramSocketImpl.java b/libjava/java/net/PlainDatagramSocketImpl.java
index 9a290dc..7076ccf 100644
--- 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 df9d438..49155d9 100644
--- 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();
}
}
--
cgit v1.1