2006-09-20 Casey Marshall <csm@gnu.org>

	* gnu/java/nio/SocketChannelImpl.java (finishConnect): don't
	call `isConnected.'
	(isConnected): return false if `connectionPending' is true.

1 files changed, 9 insertions, 4 deletions

diff --git a/gnu/java/nio/SocketChannelImpl.java b/gnu/java/nio/SocketChannelImpl.java
index 459decf52..1c563ac09 100644
--- a/gnu/java/nio/SocketChannelImpl.java
+++ b/gnu/java/nio/SocketChannelImpl.java
@@ -175,14 +175,15 @@ public final class SocketChannelImpl extends SocketChannel
     connectionPending = !connected;
     return connected;
   }
-    
-  public boolean finishConnect ()
+
+  public boolean finishConnect()
     throws IOException
   {
     if (!isOpen())
       throw new ClosedChannelException();
-    
-    if (isConnected())
+
+    InetSocketAddress remote = channel.getPeerAddress();
+    if (remote != null)
       {
         connectionPending = false;
         return true;
@@ -196,6 +197,10 @@ public final class SocketChannelImpl extends SocketChannel
 
   public boolean isConnected()
   {
+    // Wait until finishConnect is called before transitioning to
+    // connected.
+    if (connectionPending)
+      return false;
     try
       {
         InetSocketAddress remote = channel.getPeerAddress();