Mercurial > hg > openjdk > jdk7 > jdk

changeset 3334:6f2d19ef67b1

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) Reviewed-by: chegar
author alanb
date Tue, 04 Jan 2011 17:49:50 +0000
parents 3254c3ae63fe
children 4379c762ec50
files src/windows/native/java/net/Inet4AddressImpl.c src/windows/native/java/net/Inet6AddressImpl.c
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/windows/native/java/net/Inet4AddressImpl.c	Mon Dec 27 11:39:59 2010 -0800
+++ b/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/src/windows/native/java/net/Inet6AddressImpl.c	Mon Dec 27 11:39:59 2010 -0800
+++ b/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();
           }