Add throw exception

joonhaengHeo · Nov 2, 2023 · d960f4a · d960f4a
1 parent 674cbaf
commit d960f4a
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/controller/java/CHIPDeviceController-JNI.cpp b/src/controller/java/CHIPDeviceController-JNI.cpp
@@ -552,14 +552,15 @@ JNI_METHOD(void, startOTAProvider)(JNIEnv * env, jobject self, jlong handle, job
     CHIP_ERROR err                           = CHIP_NO_ERROR;
     AndroidDeviceControllerWrapper * wrapper = AndroidDeviceControllerWrapper::FromJNIHandle(handle);
 
-    VerifyOrReturn(wrapper != nullptr, ChipLogError(Controller, "wrapper is null"));
+    VerifyOrExit(wrapper != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     ChipLogProgress(Controller, "startOTAProvider() called");
     err = wrapper->StartOTAProvider(otaProviderDelegate);
 
+exit:
     if (err != CHIP_NO_ERROR)
     {
-        ChipLogError(Controller, "Failed to start OTA Provider.");
+        ChipLogError(Controller, "Failed to start OTA Provider. : %" CHIP_ERROR_FORMAT, err.Format());
         JniReferences::GetInstance().ThrowError(env, sChipDeviceControllerExceptionCls, err);
     }
 #endif
@@ -572,15 +573,15 @@ JNI_METHOD(void, finishOTAProvider)(JNIEnv * env, jobject self, jlong handle)
     CHIP_ERROR err                           = CHIP_NO_ERROR;
     AndroidDeviceControllerWrapper * wrapper = AndroidDeviceControllerWrapper::FromJNIHandle(handle);
 
-    VerifyOrReturn(wrapper != nullptr, ChipLogError(Controller, "wrapper is null"));
+    VerifyOrExit(wrapper != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     ChipLogProgress(Controller, "finishOTAProvider() called");
 
     err = wrapper->FinishOTAProvider();
-
+exit:
     if (err != CHIP_NO_ERROR)
     {
-        ChipLogError(Controller, "Failed to finish OTA Provider.");
+        ChipLogError(Controller, "Failed to finish OTA Provider. : %" CHIP_ERROR_FORMAT, err.Format());
         JniReferences::GetInstance().ThrowError(env, sChipDeviceControllerExceptionCls, err);
     }
 #endif