commit 8709d30d7a1e2f3d072791c478ba5e73a9b4ec05
author Jesse Schettler <jschettler@google.com> Tue Oct 09 11:08:15 2018 -0600
committer Jesse Schettler <jschettler@google.com> Thu Oct 18 15:30:57 2018 +0000
tree 804ad88e8ad0cbd732c708f606da0944dc7c741e
parent 21bfeeea460866bb7b3a13a964fa2c09d9a2e874

Check for nullptr instead of JNI exception after using FindClass

When FindClass fails to find the specified class, it returns a
nullptr but does not always throw a JNI error/exception. This change
checks for nullptr instead of a JNI exception after using FindClass.

Bug: 112338190
Bug: 117498290
Test: atest CtsJvmtiRedefineClassesHostTestCases \
            CtsJvmtiTaggingHostTestCases \
            CtsJvmtiTrackingHostTestCases

Change-Id: Icde79b3812f877553dd085cfaa31f2b0969266c3
(cherry picked from commit 1cbfea0c428535b371d364d4f0aa92ece3c0f939)
Merged-In: Icde79b3812f877553dd085cfaa31f2b0969266c3

hostsidetests/jvmti/base/jni/redefine.cpp

diff --git a/hostsidetests/jvmti/base/jni/redefine.cpp b/hostsidetests/jvmti/base/jni/redefine.cpp
index 003b909..7656fb3 100644
--- a/hostsidetests/jvmti/base/jni/redefine.cpp
+++ b/hostsidetests/jvmti/base/jni/redefine.cpp
@@ -196,7 +196,7 @@
 void register_android_jvmti_cts_JvmtiRedefineClassesTest(jvmtiEnv* jenv, JNIEnv* env) {
   ScopedLocalRef<jclass> klass(env, FindClass(jenv, env,
           "android/jvmti/cts/JvmtiRedefineClassesTest", nullptr));
-  if (env->ExceptionCheck()) {
+  if (klass.get() == nullptr) {
     env->ExceptionClear();
     return;
   }

hostsidetests/jvmti/base/jni/tagging.cpp

diff --git a/hostsidetests/jvmti/base/jni/tagging.cpp b/hostsidetests/jvmti/base/jni/tagging.cpp
index d2208f3..8ab4a10 100644
--- a/hostsidetests/jvmti/base/jni/tagging.cpp
+++ b/hostsidetests/jvmti/base/jni/tagging.cpp
@@ -138,7 +138,7 @@
 
 void register_art_Main(jvmtiEnv* jenv, JNIEnv* env) {
   ScopedLocalRef<jclass> klass(env, FindClass(jenv, env, "art/Main", nullptr));
-  if (env->ExceptionCheck()) {
+  if (klass.get() == nullptr) {
     env->ExceptionClear();
     return;
   }
@@ -159,7 +159,7 @@
 void register_android_jvmti_cts_JvmtiTaggingTest(jvmtiEnv* jenv, JNIEnv* env) {
   ScopedLocalRef<jclass> klass(env, FindClass(jenv, env,
           "android/jvmti/cts/JvmtiTaggingTest", nullptr));
-  if (env->ExceptionCheck()) {
+  if (klass.get() == nullptr) {
     env->ExceptionClear();
     return;
   }

hostsidetests/jvmti/base/jni/tracking.cpp

diff --git a/hostsidetests/jvmti/base/jni/tracking.cpp b/hostsidetests/jvmti/base/jni/tracking.cpp
index 0503e82..5ee6d57 100644
--- a/hostsidetests/jvmti/base/jni/tracking.cpp
+++ b/hostsidetests/jvmti/base/jni/tracking.cpp
@@ -108,7 +108,7 @@
 void register_android_jvmti_cts_JvmtiTrackingTest(jvmtiEnv* jenv, JNIEnv* env) {
   ScopedLocalRef<jclass> klass(env, FindClass(jenv, env,
           "android/jvmti/cts/JvmtiTrackingTest", nullptr));
-  if (env->ExceptionCheck()) {
+  if (klass.get() == nullptr) {
     env->ExceptionClear();
     return;
   }