From 26067b8be85669cf7ec6ff91d764b27177c24ae6 Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Wed, 7 Jan 2004 16:51:49 +0000 Subject: 2004-01-07 Michael Koch * 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 --- libjava/gnu/java/nio/ServerSocketChannelImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'libjava/gnu/java/nio/ServerSocketChannelImpl.java') diff --git a/libjava/gnu/java/nio/ServerSocketChannelImpl.java b/libjava/gnu/java/nio/ServerSocketChannelImpl.java index 97943c0ff8e..fd975d20a7a 100644 --- a/libjava/gnu/java/nio/ServerSocketChannelImpl.java +++ b/libjava/gnu/java/nio/ServerSocketChannelImpl.java @@ -55,7 +55,6 @@ import java.nio.channels.spi.SelectorProvider; public final class ServerSocketChannelImpl extends ServerSocketChannel { private NIOServerSocket serverSocket; - private boolean blocking = true; private boolean connected; protected ServerSocketChannelImpl (SelectorProvider provider) @@ -63,6 +62,7 @@ public final class ServerSocketChannelImpl extends ServerSocketChannel { super (provider); serverSocket = new NIOServerSocket (this); + configureBlocking(true); } public int getNativeFD() @@ -93,7 +93,6 @@ public final class ServerSocketChannelImpl extends ServerSocketChannel protected void implConfigureBlocking (boolean blocking) throws IOException { serverSocket.setSoTimeout (blocking ? 0 : NIOConstants.DEFAULT_TIMEOUT); - this.blocking = blocking; } public SocketChannel accept () throws IOException -- cgit v1.2.3