From 62ac2b419812caeb020c7ff868feab249c0d1f4b Mon Sep 17 00:00:00 2001
From: joonhaengHeo <85541460+joonhaengHeo@users.noreply.github.com>
Date: Wed, 6 Sep 2023 01:11:02 +0900
Subject: [PATCH] Fix Android Commissioning Crash (#29063)

---
 src/lib/support/JniReferences.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/lib/support/JniReferences.cpp b/src/lib/support/JniReferences.cpp
index 6ad7e26d215409..36f6b98e7e8a6a 100644
--- a/src/lib/support/JniReferences.cpp
+++ b/src/lib/support/JniReferences.cpp
@@ -84,12 +84,13 @@ CHIP_ERROR JniReferences::GetClassRef(JNIEnv * env, const char * clsType, jclass
     if (strcmp(clsType, "java/util/Optional") == 0)
     {
         cls = env->FindClass("j$/util/Optional");
+        env->ExceptionClear();
     }
 
     if (cls == nullptr)
     {
-        env->ExceptionClear();
         cls = env->FindClass(clsType);
+        env->ExceptionClear();
     }
 
     if (cls == nullptr)