project-chip#26925 update check for missing fabricIdx and nodeId

mmarc · Jul 21, 2023 · 91e5596 · 91e5596
1 parent 8778bfd
commit 91e5596
Showing 1 changed file with 5 additions and 13 deletions.
diff --git a/src/app/clusters/door-lock-server/door-lock-server.cpp b/src/app/clusters/door-lock-server/door-lock-server.cpp
@@ -128,22 +128,14 @@ bool DoorLockServer::SetLockState(chip::EndpointId endpointId, DlLockState newLo
         opType = LockOperationTypeEnum::kUnlatch;
     }
 
-    if (OperationSourceEnum::kRemote == opSource)
+    if (OperationSourceEnum::kRemote == opSource && (fabricIdx.IsNull() || nodeId.IsNull()))
     {
-        if (fabricIdx.IsNull() || nodeId.IsNull())
-        {
-            ChipLogError(Zcl, "Received SetLockState for remote operation without fabricIdx or nodeId");
-        }
-
-        SendLockOperationEvent(endpointId, opType, opSource, OperationErrorEnum::kUnspecified, userIndex, fabricIdx, nodeId,
-                               credentials, success);
-    }
-    else
-    {
-        SendLockOperationEvent(endpointId, opType, opSource, OperationErrorEnum::kUnspecified, userIndex, NullNullable,
-                               NullNullable, credentials, success);
+        ChipLogError(Zcl, "Received SetLockState for remote operation without fabricIdx or nodeId");
     }
 
+    SendLockOperationEvent(endpointId, opType, opSource, OperationErrorEnum::kUnspecified, userIndex, fabricIdx, nodeId,
+                           credentials, success);
+
     // Reset wrong entry attempts (in case there were any incorrect credentials presented before) if lock/unlock was a success
     // and a valid credential was presented.
     if (success && !credentials.IsNull() && !(credentials.Value().empty()))