From f9239f8eaca3a37974b9b5cc5a97676511cae1cd Mon Sep 17 00:00:00 2001 From: Alan Bateman Date: Tue, 4 Jan 2011 17:49:50 +0000 Subject: [PATCH] 7010192: InetAddress.isReachable hits ShouldNotReachHere with hs20-b04 (win) Reviewed-by: chegar --- jdk/src/windows/native/java/net/Inet4AddressImpl.c | 4 ++-- jdk/src/windows/native/java/net/Inet6AddressImpl.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jdk/src/windows/native/java/net/Inet4AddressImpl.c b/jdk/src/windows/native/java/net/Inet4AddressImpl.c index cb132db83f4..197800dc59b 100644 --- a/jdk/src/windows/native/java/net/Inet4AddressImpl.c +++ b/jdk/src/windows/native/java/net/Inet4AddressImpl.c @@ -559,8 +559,8 @@ Java_java_net_Inet4AddressImpl_isReachable0(JNIEnv *env, jobject this, 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(); } diff --git a/jdk/src/windows/native/java/net/Inet6AddressImpl.c b/jdk/src/windows/native/java/net/Inet6AddressImpl.c index 87f9568a97a..1f9a6779e6e 100644 --- a/jdk/src/windows/native/java/net/Inet6AddressImpl.c +++ b/jdk/src/windows/native/java/net/Inet6AddressImpl.c @@ -671,8 +671,8 @@ Java_java_net_Inet6AddressImpl_isReachable0(JNIEnv *env, jobject this, 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(); }