* gnu/java/net/PlainSocketImpl.java
(inChannelOperation): New field. (isInChannelOperation): New accessor. (setInChannelOperation): New modifier. * gnu/java/nio/ServerSocketChannelImpl.java (accept): Set and reset our server socket's PlainSocketImpl's "in channel operation" indicator before and after delegating the accept to our server socket. * gnu/java/nio/SocketChannelImpl.java (connect): Set and reset our socket's PlainSocketImpl's "in channel operation" indicator before and after delegating the operation to our socket. (read): Likewise. (write): Likewise. * java/net/ServerSocket.java (implAccept): Don't throw an IllegalBlockingModeException if we have a non-blocking channel which initiated this accept operation. * java/net/Socket.java (connect): Don't throw an IllegalBlockingModeException if we have a non-blocking channel which initiated this connect operation. * java/nio/channels/spi/AbstractSelectableChannel.java (configureBlocking): Only call implConfigureBlocking() if the desired blocking mode is different from our current one. From-SVN: r76956
This commit is contained in:
parent
d1615643e5
commit
7dcc98e25c
7 changed files with 127 additions and 26 deletions
|
@ -1,5 +1,5 @@
|
|||
/* AbstractSelectableChannel.java
|
||||
Copyright (C) 2002, 2003 Free Software Foundation, Inc.
|
||||
Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
|
||||
|
||||
This file is part of GNU Classpath.
|
||||
|
||||
|
@ -80,8 +80,11 @@ public abstract class AbstractSelectableChannel extends SelectableChannel
|
|||
{
|
||||
synchronized (blockingLock())
|
||||
{
|
||||
implConfigureBlocking(blocking);
|
||||
this.blocking = blocking;
|
||||
if (this.blocking != blocking)
|
||||
{
|
||||
implConfigureBlocking(blocking);
|
||||
this.blocking = blocking;
|
||||
}
|
||||
}
|
||||
|
||||
return this;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue