Address review comments

project-chip · Jan 31, 2025 · 7ed7fff · 7ed7fff
1 parent 752d2f6
commit 7ed7fff
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/IMClusterCommandHandler.cpp b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/IMClusterCommandHandler.cpp
@@ -1928,7 +1928,8 @@ void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV:
         errorStatus = Clusters::WindowCovering::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
         break;
     default:
-        // If we already validated that the cluster does indeed exist in our CHI,
+        // If we already validated that the cluster does indeed exist (e.g. when dispatching to CommandHandlerInterface for that
+        // cluster).
         if (aClusterIsValid)
         {
             errorStatus = Protocols::InteractionModel::Status::UnsupportedCommand;

diff --git a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/IMClusterCommandHandler.cpp b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/IMClusterCommandHandler.cpp
@@ -1015,7 +1015,8 @@ void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV:
         errorStatus = Clusters::ThreadNetworkDiagnostics::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
         break;
     default:
-        // If we already validated that the cluster does indeed exist in our CHI,
+        // If we already validated that the cluster does indeed exist (e.g. when dispatching to CommandHandlerInterface for that
+        // cluster).
         if (aClusterIsValid)
         {
             errorStatus = Protocols::InteractionModel::Status::UnsupportedCommand;

diff --git a/src/data-model-providers/codegen/CodegenDataModelProvider.cpp b/src/data-model-providers/codegen/CodegenDataModelProvider.cpp
@@ -164,7 +164,12 @@ std::optional<DataModel::ActionReturnStatus> CodegenDataModelProvider::Invoke(co
     CommandHandlerInterface * handler_interface =
         CommandHandlerInterfaceRegistry::Instance().GetCommandHandler(request.path.mEndpointId, request.path.mClusterId);
 
-    if (handler_interface)
+    // Some CommandHandlerInterface instances are registered of ALL endpoints, so make sure first that
+    // the cluster actually exists on this endpoint before asking the CommandHandlerInterface whether it
+    // supports the command.
+    const bool clusterIsPresent = (FindServerCluster(request.path) != nullptr);
+
+    if (clusterIsPresent && handler_interface)
     {
         clusterRecognizedByCHI = true;
         CommandHandlerInterface::HandlerContext context(*handler, request.path, input_arguments);