Rename ReadHandler::GetFabricIndex to GetAccessingFabricIndex. (#12043)

Makes it clearer which of the fabric indices it is.
project-chip · Nov 29, 2023 · 74ef746 · 74ef746
1 parent 5381378
commit 74ef746
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/app/InteractionModelEngine.cpp b/src/app/InteractionModelEngine.cpp
@@ -305,7 +305,7 @@ CHIP_ERROR InteractionModelEngine::OnReadInitialRequest(Messaging::ExchangeConte
  {
  if (!readHandler.IsFree() && readHandler.IsSubscriptionType() &&
  readHandler.GetInitiatorNodeId() == apExchangeContext->GetSessionHandle().GetPeerNodeId() &&
- readHandler.GetFabricIndex() == apExchangeContext->GetSessionHandle().GetFabricIndex())
+ readHandler.GetAccessingFabricIndex() == apExchangeContext->GetSessionHandle().GetFabricIndex())
  {
  bool keepSubscriptions = true;
  System::PacketBufferTLVReader reader;

diff --git a/src/app/ReadHandler.h b/src/app/ReadHandler.h
@@ -144,7 +144,7 @@ class ReadHandler : public Messaging::ExchangeDelegate
  void ClearDirty() { mDirty = false; }
  bool IsDirty() { return mDirty; }
  NodeId GetInitiatorNodeId() const { return mInitiatorNodeId; }
- FabricIndex GetFabricIndex() const { return mFabricIndex; }
+ FabricIndex GetAccessingFabricIndex() const { return mFabricIndex; }
 
 private:
  friend class TestReadInteraction;

diff --git a/src/app/reporting/Engine.cpp b/src/app/reporting/Engine.cpp
@@ -129,7 +129,7 @@ CHIP_ERROR Engine::BuildSingleReportDataAttributeReportIBs(ReportDataMessage::Bu
 
  TLV::TLVWriter attributeBackup;
  attributeReportIBs.Checkpoint(attributeBackup);
- err = RetrieveClusterData(apReadHandler->GetFabricIndex(), attributeReportIBs, readPath);
+ err = RetrieveClusterData(apReadHandler->GetAccessingFabricIndex(), attributeReportIBs, readPath);
  if (err != CHIP_NO_ERROR)
  {
  // We met a error during writing reports, one common case is we are running out of buffer, rollback the