Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7010192: InetAddress.isReachable hits ShouldNotReachHere with hs20-b04 (win)
authoralanb
Tue, 04 Jan 2011 17:49:50 +0000
changeset 7814 dff0b40f9ac8
parent 7813 5a1209e8dcbf
child 7815 12cc7f77e459
7010192: InetAddress.isReachable hits ShouldNotReachHere with hs20-b04 (win) Reviewed-by: chegar
jdk/src/windows/native/java/net/Inet4AddressImpl.c file | annotate | diff | comparison | revisions
jdk/src/windows/native/java/net/Inet6AddressImpl.c file | annotate | diff | comparison | revisions 
--- a/jdk/src/windows/native/java/net/Inet4AddressImpl.c	Mon Dec 27 11:39:59 2010 -0800
+++ b/jdk/src/windows/native/java/net/Inet4AddressImpl.c	Tue Jan 04 17:49:50 2011 +0000
@@ -559,8 +559,8 @@
 
         if (timeout >= 0) {
           optlen = sizeof(connect_rv);
-          if (JVM_GetSockOpt(fd, SOL_SOCKET, SO_ERROR, (void*)&connect_rv,
-                             &optlen) <0) {
+          if (getsockopt(fd, SOL_SOCKET, SO_ERROR, (void*)&connect_rv,
+                         &optlen) <0) {
             connect_rv = WSAGetLastError();
           }
 
--- a/jdk/src/windows/native/java/net/Inet6AddressImpl.c	Mon Dec 27 11:39:59 2010 -0800
+++ b/jdk/src/windows/native/java/net/Inet6AddressImpl.c	Tue Jan 04 17:49:50 2011 +0000
@@ -671,8 +671,8 @@
         if (timeout >= 0) {
           /* has connection been established? */
           optlen = sizeof(connect_rv);
-          if (JVM_GetSockOpt(fd, SOL_SOCKET, SO_ERROR, (void*)&connect_rv,
-                             &optlen) <0) {
+          if (getsockopt(fd, SOL_SOCKET, SO_ERROR, (void*)&connect_rv,
+                         &optlen) <0) {
             connect_rv = WSAGetLastError();
           }
jdk-sandbox