Review

project-chip · Jul 27, 2022 · c707843 · c707843
1 parent 10ab053
commit c707843
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/app/ReadClient.cpp b/src/app/ReadClient.cpp
@@ -1024,7 +1024,7 @@ void ReadClient::OnResubscribeTimerCallback(System::Layer * apSystemLayer, void
         //
         if (_this->mReadPrepareParams.mSessionHolder)
         {
-            _this->mReadPrepareParams.mSessionHolder.Get().Value()->AsSecureSession()->MarkAsDefunct();
+            _this->mReadPrepareParams.mSessionHolder->AsSecureSession()->MarkAsDefunct();
         }
 
         //
@@ -1049,8 +1049,8 @@ void ReadClient::OnResubscribeTimerCallback(System::Layer * apSystemLayer, void
     if (err != CHIP_NO_ERROR)
     {
         //
-        // Call Close (which should trigger re-subscription again) EXCEPT if we got here because we didn't have a valid fabric,
-        // or an invalid CASESessionManager pointer when mDoCaseOnNextResub was true.
+        // Call Close (which should trigger re-subscription again) EXCEPT if we got here because we didn't have a valid
+        // CASESessionManager pointer when mDoCaseOnNextResub was true.
         //
         // In that case, don't permit re-subscription to occur.
         //

diff --git a/src/controller/java/AndroidCallbacks.cpp b/src/controller/java/AndroidCallbacks.cpp
@@ -549,8 +549,7 @@ void ReportEventCallback::OnSubscriptionEstablished(SubscriptionId aSubscription
 
 CHIP_ERROR ReportEventCallback::OnResubscriptionNeeded(app::ReadClient * apReadClient, CHIP_ERROR aTerminationCause)
 {
-    VerifyOrReturn(mResubscriptionAttemptCallbackRef != nullptr,
-                   ChipLogError(Controller, "mResubscriptionAttemptCallbackRef is null"));
+    VerifyOrReturnLogError(mResubscriptionAttemptCallbackRef != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
 
     CHIP_ERROR err = CHIP_NO_ERROR;
     JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();