@@ -734,12 +734,14 @@ JNI_METHOD(void, updateCommissioningNetworkCredentials)
734
734
{
735
735
ChipLogError (Controller, " ApplyNetworkCredentials failed. Err = %" CHIP_ERROR_FORMAT, err.Format ());
736
736
JniReferences::GetInstance ().ThrowError (env, sChipDeviceControllerExceptionCls , err);
737
+ return ;
737
738
}
738
739
err = wrapper->UpdateCommissioningParameters (commissioningParams);
739
740
if (err != CHIP_NO_ERROR)
740
741
{
741
742
ChipLogError (Controller, " UpdateCommissioningParameters failed. Err = %" CHIP_ERROR_FORMAT, err.Format ());
742
743
JniReferences::GetInstance ().ThrowError (env, sChipDeviceControllerExceptionCls , err);
744
+ return ;
743
745
}
744
746
745
747
// 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
919
921
{
920
922
ChipLogError (Controller, " Failed to get device address." );
921
923
JniReferences::GetInstance ().ThrowError (env, sChipDeviceControllerExceptionCls , err);
924
+ return nullptr ;
922
925
}
923
926
924
927
addr.ToString (addrStr);
@@ -962,6 +965,7 @@ JNI_METHOD(jobject, getNetworkLocation)(JNIEnv * env, jobject self, jlong handle
962
965
{
963
966
ChipLogError (Controller, " Failed to get device address." );
964
967
JniReferences::GetInstance ().ThrowError (env, sChipDeviceControllerExceptionCls , err);
968
+ return nullptr ;
965
969
}
966
970
967
971
addr.GetIPAddress ().ToString (addrStr);
@@ -1176,6 +1180,7 @@ JNI_METHOD(jbyteArray, getAttestationChallenge)
1176
1180
{
1177
1181
ChipLogProgress (Controller, " Could not cast device pointer to Device object" );
1178
1182
JniReferences::GetInstance ().ThrowError (env, sChipDeviceControllerExceptionCls , CHIP_ERROR_INCORRECT_STATE);
1183
+ return nullptr ;
1179
1184
}
1180
1185
1181
1186
err = chipDevice->GetAttestationChallenge (attestationChallenge);
@@ -1260,6 +1265,7 @@ JNI_METHOD(void, subscribe)
1260
1265
{
1261
1266
ChipLogError (Controller, " No device found" );
1262
1267
JniReferences::GetInstance ().ThrowError (env, sChipDeviceControllerExceptionCls , CHIP_ERROR_INCORRECT_STATE);
1268
+ return ;
1263
1269
}
1264
1270
1265
1271
std::vector<app::AttributePathParams> attributePathParamsList;
@@ -1311,6 +1317,7 @@ JNI_METHOD(void, read)
1311
1317
{
1312
1318
ChipLogError (Controller, " No device found" );
1313
1319
JniReferences::GetInstance ().ThrowError (env, sChipDeviceControllerExceptionCls , CHIP_ERROR_INCORRECT_STATE);
1320
+ return ;
1314
1321
}
1315
1322
1316
1323
std::vector<app::AttributePathParams> attributePathParamsList;
0 commit comments