# HG changeset patch # User khazra # Date 1338322577 25200 # Node ID 712335896cc4c9d4cd1026928cd358c08e5da8ac # Parent 6a35a44533e3065040427f6dc56fc8beb07d73c2 7171591: getDefaultScopeID() in src/solaris/native/java/net/net_util_md.c should return a value Summary: Use CHECK_NULL_RETURN instead of CHECK_NULL Reviewed-by: alanb diff -r 6a35a44533e3 -r 712335896cc4 jdk/src/solaris/native/java/net/net_util_md.c --- a/jdk/src/solaris/native/java/net/net_util_md.c Tue May 29 09:42:09 2012 +0800 +++ b/jdk/src/solaris/native/java/net/net_util_md.c Tue May 29 13:16:17 2012 -0700 @@ -114,9 +114,9 @@ static jfieldID ni_defaultIndexID; if (ni_class == NULL) { jclass c = (*env)->FindClass(env, "java/net/NetworkInterface"); - CHECK_NULL(c); + CHECK_NULL_RETURN(c, 0); c = (*env)->NewGlobalRef(env, c); - CHECK_NULL(c); + CHECK_NULL_RETURN(c, 0); ni_defaultIndexID = (*env)->GetStaticFieldID(env, c, "defaultIndex", "I"); ni_class = c;