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/java/nio | |
| parent | 89e4eb2a348fb9d7679a401a2e6bba8a8209e211 (diff) | |
| download | gcc-26067b8be85669cf7ec6ff91d764b27177c24ae6.zip gcc-26067b8be85669cf7ec6ff91d764b27177c24ae6.tar.gz gcc-26067b8be85669cf7ec6ff91d764b27177c24ae6.tar.bz2 | |
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/java/nio')
| -rw-r--r-- | libjava/java/nio/channels/spi/AbstractSelectableChannel.java | 10 |
1 files changed, 5 insertions, 5 deletions
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); |