From 7ce2be3adae52225c99773457d6745766f12da83 Mon Sep 17 00:00:00 2001 From: dfuchs Date: Mon, 7 Sep 2015 10:37:00 +0200 Subject: [PATCH] 8080486: JNI exception pending in jdk/src/java.base/windows/native/libnet/DualStackPlainSocketImpl.c Reviewed-by: alanb, chegar, igerasim Contributed-by: vyom.tewari@oracle.com --- src/share/native/java/net/InetAddress.c | 1 + src/windows/native/java/net/DualStackPlainSocketImpl.c | 1 + 2 files changed, 2 insertions(+) diff --git a/src/share/native/java/net/InetAddress.c b/src/share/native/java/net/InetAddress.c index 3809dd3dc..a0d55c24e 100644 --- a/src/share/native/java/net/InetAddress.c +++ b/src/share/native/java/net/InetAddress.c @@ -58,6 +58,7 @@ Java_java_net_InetAddress_init(JNIEnv *env, jclass cls) { c = (*env)->FindClass(env,"java/net/InetAddress$InetAddressHolder"); CHECK_NULL(c); iac_class = (*env)->NewGlobalRef(env, c); + CHECK_NULL(iac_class); ia_holderID = (*env)->GetFieldID(env, ia_class, "holder", "Ljava/net/InetAddress$InetAddressHolder;"); CHECK_NULL(ia_holderID); ia_preferIPv6AddressID = (*env)->GetStaticFieldID(env, ia_class, "preferIPv6Address", "Z"); diff --git a/src/windows/native/java/net/DualStackPlainSocketImpl.c b/src/windows/native/java/net/DualStackPlainSocketImpl.c index 604ea9f7c..8a666079f 100644 --- a/src/windows/native/java/net/DualStackPlainSocketImpl.c +++ b/src/windows/native/java/net/DualStackPlainSocketImpl.c @@ -47,6 +47,7 @@ JNIEXPORT void JNICALL Java_java_net_DualStackPlainSocketImpl_initIDs isa_class = (*env)->NewGlobalRef(env, cls); isa_ctorID = (*env)->GetMethodID(env, cls, "", "(Ljava/net/InetAddress;I)V"); + CHECK_NULL(isa_ctorID); // implement read timeout with select. isRcvTimeoutSupported = 0; -- GitLab