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/java/nio/channels/spi/AbstractSelectableChannel.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libjava/java') diff --git a/libjava/java/nio/channels/spi/AbstractSelectableChannel.java b/libjava/java/nio/channels/spi/AbstractSelectableChannel.java index b027b03..17d6a2e 100644 --- a/libjava/java/nio/channels/spi/AbstractSelectableChannel.java +++ b/libjava/java/nio/channels/spi/AbstractSelectableChannel.java @@ -75,13 +75,13 @@ public abstract class AbstractSelectableChannel extends SelectableChannel /** * Adjusts this channel's blocking mode. */ - public final SelectableChannel configureBlocking (boolean block) + public final SelectableChannel configureBlocking (boolean blocking) throws IOException { - synchronized (LOCK) + synchronized (blockingLock()) { - blocking = true; - implConfigureBlocking (block); + implConfigureBlocking(blocking); + this.blocking = blocking; } return this; @@ -187,7 +187,7 @@ public abstract class AbstractSelectableChannel extends SelectableChannel SelectionKey key = null; AbstractSelector selector = (AbstractSelector) selin; - synchronized (LOCK) + synchronized (blockingLock()) { key = locate (selector); -- cgit v1.1