diff options
| author | Michael Koch <konqueror@gmx.de> | 2004-01-07 16:51:49 +0000 |
|---|---|---|
| committer | Michael Koch <mkoch@gcc.gnu.org> | 2004-01-07 16:51:49 +0000 |
| commit | 26067b8be85669cf7ec6ff91d764b27177c24ae6 (patch) | |
| tree | 1a5cce4d1dcdf5ff059d56623bff738979decfdf /libjava/gnu/java/nio/SocketChannelImpl.java | |
| parent | 89e4eb2a348fb9d7679a401a2e6bba8a8209e211 (diff) | |
2004-01-07 Michael Koch <konqueror@gmx.de>
* gnu/java/nio/DatagramChannelImpl.java
(blocking): Removed.
(DatagramChannelImpl): Call configureBlocking().
(implConfigureBlocking): Dont initialize blocking.
* gnu/java/nio/ServerSocketChannelImpl.java
(blocking): Removed.
(ServerSocketChannelImpl): Call configureBlocking().
(implConfigureBlocking): Dont initialize blocking.
* gnu/java/nio/SocketChannelImpl.java
(blocking): Removed.
(SocketChannelImpl): Call configureBlocking().
(implConfigureBlocking): Dont initialize blocking.
(connect): Use isBlocking().
* java/nio/channels/spi/AbstractSelectableChannel.java
(configureBlocking): Use blockingLock() instead of LOCK.
Set blocking after successfully called implConfigureBlocking().
(register): Use blockingLock() instead of LOCK.
From-SVN: r75507
Diffstat (limited to 'libjava/gnu/java/nio/SocketChannelImpl.java')
| -rw-r--r-- | libjava/gnu/java/nio/SocketChannelImpl.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libjava/gnu/java/nio/SocketChannelImpl.java b/libjava/gnu/java/nio/SocketChannelImpl.java index ced8ef2476a..efb5fec481b 100644 --- a/libjava/gnu/java/nio/SocketChannelImpl.java +++ b/libjava/gnu/java/nio/SocketChannelImpl.java @@ -65,7 +65,6 @@ public final class SocketChannelImpl extends SocketChannel { private PlainSocketImpl impl; private NIOSocket socket; - private boolean blocking = true; private boolean connectionPending; SocketChannelImpl (SelectorProvider provider) @@ -74,6 +73,7 @@ public final class SocketChannelImpl extends SocketChannel super (provider); impl = new PlainSocketImpl(); socket = new NIOSocket (impl, this); + configureBlocking(true); } SocketChannelImpl (SelectorProvider provider, @@ -117,7 +117,6 @@ public final class SocketChannelImpl extends SocketChannel protected void implConfigureBlocking (boolean blocking) throws IOException { socket.setSoTimeout (blocking ? 0 : NIOConstants.DEFAULT_TIMEOUT); - this.blocking = blocking; } public boolean connect (SocketAddress remote) throws IOException @@ -137,7 +136,7 @@ public final class SocketChannelImpl extends SocketChannel if (((InetSocketAddress) remote).isUnresolved()) throw new UnresolvedAddressException(); - if (blocking) + if (isBlocking()) { // Do blocking connect. socket.connect (remote); |