2004-02-05 Michael Koch <konqueror@gmx.de>
* gnu/java/nio/NIOServerSocket.java (impl): Unused, removed. * gnu/java/nio/SocketChannelImpl.java (finnishConnect): Don't throw NoConnectionPendingException if not connected or no connection pending. From-SVN: r77317
This commit is contained in:
parent
92ff3e4314
commit
99814868c1
3 changed files with 10 additions and 3 deletions
|
@ -1,5 +1,5 @@
|
|||
/* NIOServerSocket.java --
|
||||
Copyright (C) 2003 Free Software Foundation, Inc.
|
||||
Copyright (C) 2003, 2004 Free Software Foundation, Inc.
|
||||
|
||||
This file is part of GNU Classpath.
|
||||
|
||||
|
@ -50,7 +50,6 @@ import java.nio.channels.SocketChannel;
|
|||
*/
|
||||
public final class NIOServerSocket extends ServerSocket
|
||||
{
|
||||
private PlainSocketImpl impl;
|
||||
private ServerSocketChannelImpl channel;
|
||||
|
||||
protected NIOServerSocket (ServerSocketChannelImpl channel)
|
||||
|
|
|
@ -174,7 +174,7 @@ public final class SocketChannelImpl extends SocketChannel
|
|||
if (!isOpen())
|
||||
throw new ClosedChannelException();
|
||||
|
||||
if (!connectionPending)
|
||||
if (!isConnected() && !connectionPending)
|
||||
throw new NoConnectionPendingException();
|
||||
|
||||
if (isConnected())
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue