--- a/src/java.base/share/native/libjli/java.c Fri Sep 22 15:28:16 2017 -0700
+++ b/src/java.base/share/native/libjli/java.c Fri Sep 22 15:32:09 2017 -0700
@@ -1517,6 +1517,7 @@
}
str = (*env)->CallStaticObjectMethod(env, cls,
makePlatformStringMID, USE_STDERR, ary);
+ CHECK_EXCEPTION_RETURN_VALUE(0);
(*env)->DeleteLocalRef(env, ary);
return str;
}
@@ -1585,13 +1586,16 @@
GetApplicationClass(JNIEnv *env)
{
jmethodID mid;
+ jclass appClass;
jclass cls = GetLauncherHelperClass(env);
NULL_CHECK0(cls);
NULL_CHECK0(mid = (*env)->GetStaticMethodID(env, cls,
"getApplicationClass",
"()Ljava/lang/Class;"));
- return (*env)->CallStaticObjectMethod(env, cls, mid);
+ appClass = (*env)->CallStaticObjectMethod(env, cls, mid);
+ CHECK_EXCEPTION_RETURN_VALUE(0);
+ return appClass;
}
static char* expandWildcardOnLongOpt(char* arg) {