aboutsummaryrefslogtreecommitdiff
path: root/libjava/java/net
diff options
context:
space:
mode:
authorWarren Levy <warrenl@redhat.com>2000-12-08 10:28:32 +0000
committerWarren Levy <warrenl@gcc.gnu.org>2000-12-08 10:28:32 +0000
commitbe17b0fcff12cbe0e14ef171ba970c8c751c3694 (patch)
treeb4c3616d43b0eab88310fe6f45bc8a5671c3b806 /libjava/java/net
parentcf9f5da02f82fdf782b13f75e5328ca3d5649a06 (diff)
downloadgcc-be17b0fcff12cbe0e14ef171ba970c8c751c3694.zip
gcc-be17b0fcff12cbe0e14ef171ba970c8c751c3694.tar.gz
gcc-be17b0fcff12cbe0e14ef171ba970c8c751c3694.tar.bz2
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
Diffstat (limited to 'libjava/java/net')
-rw-r--r--libjava/java/net/PlainDatagramSocketImpl.java3
-rw-r--r--libjava/java/net/PlainSocketImpl.java3
2 files changed, 4 insertions, 2 deletions
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();
}
}