Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix merge error causing test failures. #14773

Merged
merged 1 commit into from
Feb 4, 2022
Merged

Fix merge error causing test failures. #14773

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions src/credentials/FabricTable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,10 +601,17 @@ CHIP_ERROR FabricTable::Delete(FabricIndex index)
bool fabricIsInitialized = fabric != nullptr && fabric->IsInitialized();
CompressedFabricId compressedFabricId =
fabricIsInitialized ? fabric->GetPeerId().GetCompressedFabricId() : kUndefinedCompressedFabricId;
ReturnErrorOnFailure(FabricInfo::DeleteFromStorage(mStorage, index)); // Delete from storage regardless
CHIP_ERROR err = FabricInfo::DeleteFromStorage(mStorage, index); // Delete from storage regardless
if (!fabricIsInitialized)
{
// Make sure to return the error our API promises, not whatever storage
// chose to return.
return CHIP_ERROR_NOT_FOUND;
}
ReturnErrorOnFailure(err);

ReleaseFabricIndex(index);
if (mDelegate != nullptr && fabricIsInitialized)
if (mDelegate != nullptr)
{
if (mFabricCount == 0)
{
Expand All @@ -622,10 +629,6 @@ CHIP_ERROR FabricTable::Delete(FabricIndex index)
delegate = delegate->mNext;
}
}
if (!fabricIsInitialized)
{
return CHIP_ERROR_NOT_FOUND;
}
return CHIP_NO_ERROR;
}

Expand Down