Fix JniReferences::GetOptionalValue (#36682)

* Fix JniReferences::GetOptionalValue It's possible the optional is not of class java/util/Optional so just use the object provided * fix formatting
project-chip · Nov 29, 2024 · e402b96 · e402b96
1 parent 2474fc3
commit e402b96
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/lib/support/JniReferences.cpp b/src/lib/support/JniReferences.cpp
@@ -310,8 +310,8 @@ CHIP_ERROR JniReferences::GetOptionalValue(jobject optionalObj, jobject & option
 {
     JNIEnv * env = GetEnvForCurrentThread();
     VerifyOrReturnError(env != nullptr, CHIP_JNI_ERROR_NULL_OBJECT);
-    jclass optionalCls = nullptr;
-    ReturnErrorOnFailure(chip::JniReferences::GetInstance().GetLocalClassRef(env, "java/util/Optional", optionalCls));
+    VerifyOrReturnError(optionalObj != nullptr, CHIP_JNI_ERROR_NULL_OBJECT);
+    jclass optionalCls        = env->GetObjectClass(optionalObj);
     jmethodID isPresentMethod = env->GetMethodID(optionalCls, "isPresent", "()Z");
     VerifyOrReturnError(isPresentMethod != nullptr, CHIP_JNI_ERROR_METHOD_NOT_FOUND);
     jboolean isPresent = optionalObj && env->CallBooleanMethod(optionalObj, isPresentMethod);