Skip to content

Commit

Permalink
Merge branch 'global_attributes_in_im' of github.com:andy31415/connec…
Browse files Browse the repository at this point in the history
…tedhomeip into global_attributes_in_im
  • Loading branch information
andy31415 committed Feb 3, 2025
2 parents f82d943 + 00fea8e commit db8d178
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
3 changes: 2 additions & 1 deletion src/app/data-model-provider/MetadataLookup.h
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,10 @@ class EndpointFinder
};

/// Validates that the cluster identified by `path` exists within the given provider.
/// If the endpoint does not exist, will return Status::UnsupportedEndpoint.
/// If the endpoint exists but does not have the cluster identified by the path, will return Status::UnsupportedCluster.
///
/// otherwise, it will return successStatus.
/// Otherwise, will return successStatus.
Protocols::InteractionModel::Status ValidateClusterPath(ProviderMetadataTree * provider, const ConcreteClusterPath & path,
Protocols::InteractionModel::Status successStatus);

Expand Down
3 changes: 1 addition & 2 deletions src/app/reporting/Engine.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -180,13 +180,12 @@ DataModel::ActionReturnStatus RetrieveClusterData(DataModel::Provider * dataMode
}
else if (IsSupportedGlobalAttributeNotInMetadata(readRequest.path.mAttributeId))
{
// Global attributes are NOT directly handled by datamodel providers, instead
// Global attributes are NOT directly handled by data model providers, instead
// the are routed through metadata.
status = ReadGlobalAttributeFromMetadata(dataModel, readRequest.path, attributeValueEncoder);
}
else
{

status = dataModel->ReadAttribute(readRequest, attributeValueEncoder);
}

Expand Down

0 comments on commit db8d178

Please sign in to comment.