8210147: adjust some WSAGetLastError usages in windows network coding
Reviewed-by: clanger, stuefe
diff --git a/src/java.base/windows/native/libnet/Inet4AddressImpl.c b/src/java.base/windows/native/libnet/Inet4AddressImpl.c
index 0d897f5..a59dd21 100644
--- a/src/java.base/windows/native/libnet/Inet4AddressImpl.c
+++ b/src/java.base/windows/native/libnet/Inet4AddressImpl.c
@@ -326,7 +326,7 @@
ReplyBuffer = (VOID *)malloc(ReplySize);
if (ReplyBuffer == NULL) {
IcmpCloseHandle(hIcmpFile);
- NET_ThrowNew(env, WSAGetLastError(), "Unable to allocate memory");
+ NET_ThrowNew(env, -1, "Unable to allocate memory");
return JNI_FALSE;
}
diff --git a/src/java.base/windows/native/libnet/Inet6AddressImpl.c b/src/java.base/windows/native/libnet/Inet6AddressImpl.c
index c3171bc..993e5f8 100644
--- a/src/java.base/windows/native/libnet/Inet6AddressImpl.c
+++ b/src/java.base/windows/native/libnet/Inet6AddressImpl.c
@@ -396,7 +396,7 @@
ReplyBuffer = (VOID *)malloc(ReplySize);
if (ReplyBuffer == NULL) {
IcmpCloseHandle(hIcmpFile);
- NET_ThrowNew(env, WSAGetLastError(), "Unable to allocate memory");
+ NET_ThrowNew(env, -1, "Unable to allocate memory");
return JNI_FALSE;
}
diff --git a/src/java.base/windows/native/libnet/SocketInputStream.c b/src/java.base/windows/native/libnet/SocketInputStream.c
index b4022fb..c3291b8 100644
--- a/src/java.base/windows/native/libnet/SocketInputStream.c
+++ b/src/java.base/windows/native/libnet/SocketInputStream.c
@@ -122,12 +122,13 @@
(*env)->SetByteArrayRegion(env, data, off, nread, (jbyte *)bufP);
} else {
if (nread < 0) {
+ int err = WSAGetLastError();
// Check if the socket has been closed since we last checked.
// This could be a reason for recv failing.
if ((*env)->GetIntField(env, fdObj, IO_fd_fdID) == -1) {
JNU_ThrowByName(env, "java/net/SocketException", "Socket closed");
} else {
- switch (WSAGetLastError()) {
+ switch (err) {
case WSAEINTR:
JNU_ThrowByName(env, "java/net/SocketException",
"socket closed");
