Update java/src/main/native/include/jni_utils.hpp

Co-authored-by: Jason Lowe <[email protected]>
rapidsai · Apr 22, 2022 · e313a2a · e313a2a
1 parent 907c67e
commit e313a2a
Showing 1 changed file with 9 additions and 12 deletions.
diff --git a/java/src/main/native/include/jni_utils.hpp b/java/src/main/native/include/jni_utils.hpp
@@ -816,18 +816,15 @@ inline void jni_cuda_check(JNIEnv *const env, cudaError_t cuda_status) {
     jstring j_msg = env->NewStringUTF(n_msg.c_str());                                              \
     jint e_code = static_cast<jint>(e.error_code());                                               \
     jclass ex_class = env->FindClass(class_name);                                                  \
-    if (ex_class == NULL) {                                                                        \
-      return ret_val;                                                                              \
-    }                                                                                              \
-    jmethodID ctor_id = env->GetMethodID(ex_class, "<init>", "(Ljava/lang/String;I)V");            \
-    if (ctor_id == NULL) {                                                                         \
-      return ret_val;                                                                              \
-    }                                                                                              \
-    jobject cuda_error = env->NewObject(ex_class, ctor_id, j_msg, e_code);                         \
-    if (cuda_error == NULL) {                                                                      \
-      return ret_val;                                                                              \
-    }                                                                                              \
-    env->Throw((jthrowable)cuda_error);                                                            \
+    if (ex_class != NULL) {                                                                        \
+      jmethodID ctor_id = env->GetMethodID(ex_class, "<init>", "(Ljava/lang/String;I)V");          \
+      if (ctor_id != NULL) {                                                                       \
+        jobject cuda_error = env->NewObject(ex_class, ctor_id, j_msg, e_code);                     \
+        if (cuda_error != NULL) {                                                                  \
+          env->Throw((jthrowable)cuda_error);                                                      \
+        }                                                                                          \
+      }                                                                                            \
+    }                                                                                              \       
     return ret_val;                                                                                \
   }