* 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 @@
|
|||
/* PlainSocketImpl.java -- Default socket implementation
|
||||
Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003
|
||||
Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004
|
||||
Free Software Foundation, Inc.
|
||||
|
||||
This file is part of GNU Classpath.
|
||||
|
@ -119,6 +119,33 @@ public final class PlainSocketImpl extends SocketImpl
|
|||
*/
|
||||
private OutputStream out;
|
||||
|
||||
/**
|
||||
* Indicates whether a channel initiated whatever operation
|
||||
* is being invoked on this socket.
|
||||
*/
|
||||
private boolean inChannelOperation;
|
||||
|
||||
/**
|
||||
* Indicates whether we should ignore whether any associated
|
||||
* channel is set to non-blocking mode. Certain operations
|
||||
* throw an <code>IllegalBlockingModeException</code> if the
|
||||
* associated channel is in non-blocking mode, <i>except</i>
|
||||
* if the operation is invoked by the channel itself.
|
||||
*/
|
||||
public final boolean isInChannelOperation()
|
||||
{
|
||||
return inChannelOperation;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets our indicator of whether an I/O operation is being
|
||||
* initiated by a channel.
|
||||
*/
|
||||
public final void setInChannelOperation(boolean b)
|
||||
{
|
||||
inChannelOperation = b;
|
||||
}
|
||||
|
||||
/**
|
||||
* Default do nothing constructor
|
||||
*/
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue