diff options
| author | Mark Wielaard <mark@klomp.org> | 2002-04-15 03:21:00 +0000 |
|---|---|---|
| committer | Mark Wielaard <mark@gcc.gnu.org> | 2002-04-15 03:21:00 +0000 |
| commit | 8be46a7d82d14b5d71cf81f5584fa8399980e326 (patch) | |
| tree | a7db59f6f75694acb11acaefb6f905462322b91d /libjava | |
| parent | ad8849afb51984d0fc3f2754caa72f8a34009da6 (diff) | |
| download | gcc-8be46a7d82d14b5d71cf81f5584fa8399980e326.tar.gz | |
natPlainDatagramSocketImpl.cc (close): Set timeout to 0.
* java/net/natPlainDatagramSocketImpl.cc (close): Set timeout to 0.
* java/net/natSocketImpl.cc (close): Likewise.
From-SVN: r52312
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/java/net/natPlainDatagramSocketImpl.cc | 1 | ||||
| -rw-r--r-- | libjava/java/net/natPlainSocketImpl.cc | 1 |
3 files changed, 7 insertions, 0 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 8d5a914b92c..e64860dfc86 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,10 @@ 2002-04-14 Mark Wielaard <mark@klomp.org> + * java/net/natPlainDatagramSocketImpl.cc (close): Set timeout to 0. + * java/net/natSocketImpl.cc (close): Likewise. + +2002-04-14 Mark Wielaard <mark@klomp.org> + * gnu/gcj/protocol/http/Connection.java (usingProxy): return false. 2002-04-13 Adam King <aking@dreammechanics.com> diff --git a/libjava/java/net/natPlainDatagramSocketImpl.cc b/libjava/java/net/natPlainDatagramSocketImpl.cc index e43102a1661..3c318d7667c 100644 --- a/libjava/java/net/natPlainDatagramSocketImpl.cc +++ b/libjava/java/net/natPlainDatagramSocketImpl.cc @@ -309,6 +309,7 @@ java::net::PlainDatagramSocketImpl::close () // the return value. ::close (fnum); fnum = -1; + timeout = 0; } void diff --git a/libjava/java/net/natPlainSocketImpl.cc b/libjava/java/net/natPlainSocketImpl.cc index 2ea46e6163b..2c6a2415cfb 100644 --- a/libjava/java/net/natPlainSocketImpl.cc +++ b/libjava/java/net/natPlainSocketImpl.cc @@ -428,6 +428,7 @@ java::net::PlainSocketImpl::close() } // Safe place to reset the file pointer. fnum = -1; + timeout = 0; } // Write a byte to the socket. |