diff options
| author | Mark Wielaard <mark@klomp.org> | 2006-11-26 21:32:30 +0000 |
|---|---|---|
| committer | Mark Wielaard <mark@klomp.org> | 2006-11-26 21:32:30 +0000 |
| commit | 9e283236c20855f032bc7bc1254d642091aec716 (patch) | |
| tree | 0439e48e2fda142635e1a2d19b96fda91a9946a5 | |
| parent | aa46ca9d3a4643651f90a97a30d4510a2013ad8d (diff) | |
| download | classpath-9e283236c20855f032bc7bc1254d642091aec716.tar.gz | |
* gnu/java/net/PlainSocketImpl.java (accept): Reset timeout on Socket.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | gnu/java/net/PlainSocketImpl.java | 3 |
2 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,7 @@ +2006-11-26 Mark Wielaard <mark@klomp.org> + + * gnu/java/net/PlainSocketImpl.java (accept): Reset timeout on Socket. + 2006-11-26 Dalibor Topic <robilad@kaffe.org> * native/target/.cvsignore, @@ -15,8 +19,8 @@ (Java_gnu_java_nio_VMSelector_select): Use strerror if strerror_r is not available. - Reported by: Michael Franz <mvfranz <at> gmail.com>, - Riccardo Mottola <zuse <at> libero.it> + Reported by: Michael Franz <mvfranz@gmail.com>, + Riccardo Mottola <zuse@libero.it> 2006-11-26 Dalibor Topic <robilad@kaffe.org> diff --git a/gnu/java/net/PlainSocketImpl.java b/gnu/java/net/PlainSocketImpl.java index 64e498746..5bda0a5e9 100644 --- a/gnu/java/net/PlainSocketImpl.java +++ b/gnu/java/net/PlainSocketImpl.java @@ -342,6 +342,9 @@ public class PlainSocketImpl extends SocketImpl that.impl.getState().setChannelFD(c.getState()); that.channel = new SocketChannelImpl(c); that.setOption(SO_REUSEADDR, Boolean.TRUE); + // Reset the inherited timeout. + that.setOption(SO_TIMEOUT, Integer.valueOf(0)); + } /** |