From: Anthony Green <green@redhat.com>
Date: Wed, 28 Dec 2005 18:47:18 +0000 (+0000)
Subject: natPlainSocketImplWin32.cc (connect): Same as previous patch, but for win32.
X-Git-Tag: releases/gcc-4.2.0~5128
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b21606a6c08054686b55066da4c49d12febfb60f;p=thirdparty%2Fgcc.git

natPlainSocketImplWin32.cc (connect): Same as previous patch, but for win32.

2005-12-28  Anthony Green  <green@redhat.com>

	* gnu/java/net/natPlainSocketImplWin32.cc (connect): Same
	as previous patch, but for win32.

From-SVN: r109119
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 7eea0f844a52..1606ccf9c425 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-28  Anthony Green  <green@redhat.com>
+
+	* gnu/java/net/natPlainSocketImplWin32.cc (connect): Same 
+	as previous patch, but for win32.
+
 2005-12-28  Anthony Green  <green@redhat.com>
 
 	* gnu/java/net/natPlainSocketImplPosix.cc (connect): Record
diff --git a/libjava/gnu/java/net/natPlainSocketImplWin32.cc b/libjava/gnu/java/net/natPlainSocketImplWin32.cc
index 48c7171c7c19..f54edb546309 100644
--- a/libjava/gnu/java/net/natPlainSocketImplWin32.cc
+++ b/libjava/gnu/java/net/natPlainSocketImplWin32.cc
@@ -133,6 +133,15 @@ gnu::java::net::PlainSocketImpl::connect (::java::net::SocketAddress *addr,
   ::java::net::InetAddress *host = tmp->getAddress();
   jint rport = tmp->getPort();
 
+  // Set the SocketImpl's address and port fields before we try to
+  // connect.  Note that the fact that these are set doesn't imply
+  // that we're actually connected to anything.  We need to record
+  // this data before we attempt the connect, since non-blocking
+  // SocketChannels will use this and almost certainly throw timeout
+  // exceptions.
+  address = host;
+  port = rport;
+
   union SockAddr u;
   socklen_t addrlen = sizeof(u);
   jbyteArray haddress = host->addr;
@@ -208,9 +217,6 @@ gnu::java::net::PlainSocketImpl::connect (::java::net::SocketAddress *addr,
         throwConnectException();
     }
 
-  address = host;
-  port = rport;
-
   // A bind may not have been done on this socket; if so, set localport now.
   if (localport == 0)
     {