Skip to content

Commit 2dcfa66

Browse files
authored
Add exception return in JNI (#25423)
1 parent b12e3e8 commit 2dcfa66

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

src/controller/java/CHIPDeviceController-JNI.cpp

+7
Original file line numberDiff line numberDiff line change
@@ -734,12 +734,14 @@ JNI_METHOD(void, updateCommissioningNetworkCredentials)
734734
{
735735
ChipLogError(Controller, "ApplyNetworkCredentials failed. Err = %" CHIP_ERROR_FORMAT, err.Format());
736736
JniReferences::GetInstance().ThrowError(env, sChipDeviceControllerExceptionCls, err);
737+
return;
737738
}
738739
err = wrapper->UpdateCommissioningParameters(commissioningParams);
739740
if (err != CHIP_NO_ERROR)
740741
{
741742
ChipLogError(Controller, "UpdateCommissioningParameters failed. Err = %" CHIP_ERROR_FORMAT, err.Format());
742743
JniReferences::GetInstance().ThrowError(env, sChipDeviceControllerExceptionCls, err);
744+
return;
743745
}
744746

745747
// Only invoke NetworkCredentialsReady when called in response to NetworkScan result
@@ -919,6 +921,7 @@ JNI_METHOD(jstring, getIpAddress)(JNIEnv * env, jobject self, jlong handle, jlon
919921
{
920922
ChipLogError(Controller, "Failed to get device address.");
921923
JniReferences::GetInstance().ThrowError(env, sChipDeviceControllerExceptionCls, err);
924+
return nullptr;
922925
}
923926

924927
addr.ToString(addrStr);
@@ -962,6 +965,7 @@ JNI_METHOD(jobject, getNetworkLocation)(JNIEnv * env, jobject self, jlong handle
962965
{
963966
ChipLogError(Controller, "Failed to get device address.");
964967
JniReferences::GetInstance().ThrowError(env, sChipDeviceControllerExceptionCls, err);
968+
return nullptr;
965969
}
966970

967971
addr.GetIPAddress().ToString(addrStr);
@@ -1176,6 +1180,7 @@ JNI_METHOD(jbyteArray, getAttestationChallenge)
11761180
{
11771181
ChipLogProgress(Controller, "Could not cast device pointer to Device object");
11781182
JniReferences::GetInstance().ThrowError(env, sChipDeviceControllerExceptionCls, CHIP_ERROR_INCORRECT_STATE);
1183+
return nullptr;
11791184
}
11801185

11811186
err = chipDevice->GetAttestationChallenge(attestationChallenge);
@@ -1260,6 +1265,7 @@ JNI_METHOD(void, subscribe)
12601265
{
12611266
ChipLogError(Controller, "No device found");
12621267
JniReferences::GetInstance().ThrowError(env, sChipDeviceControllerExceptionCls, CHIP_ERROR_INCORRECT_STATE);
1268+
return;
12631269
}
12641270

12651271
std::vector<app::AttributePathParams> attributePathParamsList;
@@ -1311,6 +1317,7 @@ JNI_METHOD(void, read)
13111317
{
13121318
ChipLogError(Controller, "No device found");
13131319
JniReferences::GetInstance().ThrowError(env, sChipDeviceControllerExceptionCls, CHIP_ERROR_INCORRECT_STATE);
1320+
return;
13141321
}
13151322

13161323
std::vector<app::AttributePathParams> attributePathParamsList;

0 commit comments

Comments
 (0)