@@ -232,8 +232,6 @@ CHIP_ERROR read(JNIEnv * env, jlong handle, jlong callbackHandle, jlong devicePt
232
232
233
233
SuccessOrExit (err = readClient->SendRequest (params));
234
234
callback->mReadClient = readClient;
235
-
236
- return CHIP_NO_ERROR;
237
235
exit :
238
236
if (err != CHIP_NO_ERROR)
239
237
{
@@ -247,10 +245,12 @@ CHIP_ERROR read(JNIEnv * env, jlong handle, jlong callbackHandle, jlong devicePt
247
245
if (readClient != nullptr )
248
246
{
249
247
Platform::Delete (readClient);
248
+ readClient = nullptr ;
250
249
}
251
250
if (callback != nullptr )
252
251
{
253
252
Platform::Delete (callback);
253
+ callback = nullptr ;
254
254
}
255
255
}
256
256
@@ -405,8 +405,6 @@ CHIP_ERROR write(JNIEnv * env, jlong handle, jlong callbackHandle, jlong deviceP
405
405
imTimeoutMs != 0 ? System::Clock::Milliseconds32 (imTimeoutMs) : System::Clock::kZero );
406
406
SuccessOrExit (err);
407
407
callback->mWriteClient = writeClient;
408
-
409
- return CHIP_NO_ERROR;
410
408
exit :
411
409
if (err != CHIP_NO_ERROR)
412
410
{
@@ -420,10 +418,12 @@ CHIP_ERROR write(JNIEnv * env, jlong handle, jlong callbackHandle, jlong deviceP
420
418
if (writeClient != nullptr )
421
419
{
422
420
Platform::Delete (writeClient);
421
+ writeClient = nullptr ;
423
422
}
424
423
if (callback != nullptr )
425
424
{
426
425
Platform::Delete (callback);
426
+ callback = nullptr ;
427
427
}
428
428
}
429
429
return err;
@@ -555,8 +555,6 @@ CHIP_ERROR invoke(JNIEnv * env, jlong handle, jlong callbackHandle, jlong device
555
555
: Optional<System::Clock::Timeout>::Missing ()));
556
556
557
557
callback->mCommandSender = commandSender;
558
-
559
- return CHIP_NO_ERROR;
560
558
exit :
561
559
if (err != CHIP_NO_ERROR)
562
560
{
@@ -570,10 +568,12 @@ CHIP_ERROR invoke(JNIEnv * env, jlong handle, jlong callbackHandle, jlong device
570
568
if (commandSender != nullptr )
571
569
{
572
570
Platform::Delete (commandSender);
571
+ commandSender = nullptr ;
573
572
}
574
573
if (callback != nullptr )
575
574
{
576
575
Platform::Delete (callback);
576
+ callback = nullptr ;
577
577
}
578
578
}
579
579
return err;
0 commit comments