mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-03-18 12:41:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

2004-02-05 Michael Koch <konqueror@gmx.de>

Browse Source 
* 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:
Michael Koch 2004-02-05 15:57:01 +00:00 committed by Michael Koch
parent 92ff3e4314
commit 99814868c1
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libjava/ChangeLog
View File

@ -1,3 +1,11 @@
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.
2004-02-02 Graydon Hoare <graydon@redhat.com>
* javax/swing/SwingUtilities.java: Many new functions.

3
libjava/gnu/java/nio/NIOServerSocket.java
View File

@ -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)

2
libjava/gnu/java/nio/SocketChannelImpl.java
View File

@ -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())