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
This commit is contained in:
parent
89e4eb2a34
commit
26067b8be8
5 changed files with 29 additions and 12 deletions
|
@ -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);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue