Address review commment.

project-chip · Feb 6, 2023 · 26e556c · 26e556c
1 parent af27aae
commit 26e556c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 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
@@ -380,7 +380,7 @@ void DoorLockServer::setUserCommandHandler(chip::app::CommandHandler * commandOb
         return;
     }
 
-    if (!userType.IsNull() && userType.Value() == UserTypeEnum::kUnknownEnumValue)
+    if (userType == UserTypeEnum::kUnknownEnumValue)
     {
         emberAfDoorLockClusterPrintln(
             "[SetUser] Unable to set the user: user type is unknown [endpointId=%d,userIndex=%d,userType=%u]",
@@ -693,7 +693,7 @@ void DoorLockServer::setCredentialCommandHandler(
         return;
     }
 
-    if (!userType.IsNull() && userType.Value() == UserTypeEnum::kUnknownEnumValue)
+    if (userType == UserTypeEnum::kUnknownEnumValue)
     {
         emberAfDoorLockClusterPrintln("[SetCredential] Unable to set the credential: user type is unknown "
                                       "[endpointId=%d,credentialIndex=%d,userType=%u]",

diff --git a/src/app/data-model/Nullable.h b/src/app/data-model/Nullable.h
@@ -84,6 +84,8 @@ struct Nullable : protected Optional<T>
 
     bool operator==(const Nullable & other) const { return Optional<T>::operator==(other); }
     bool operator!=(const Nullable & other) const { return !(*this == other); }
+    bool operator==(const T & other) const { return !IsNull() && Value() == other; }
+    bool operator!=(const T & other) const { return IsNull() || Value() != other; }
 };
 
 template <class T>