Reset mAddNocCommandHasBeenInvoked and mUpdateNocCommandHasBeenInvoke…

…d in ArmFailSafe
project-chip · Mar 17, 2022 · d5c3a38 · d5c3a38
1 parent 6a5f06b
commit d5c3a38
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/src/include/platform/FailSafeContext.h b/src/include/platform/FailSafeContext.h
@@ -71,11 +71,7 @@ class FailSafeContext
         mFabricIndex                    = nocFabricIndex;
     }
 
-    inline FabricIndex GetFabricIndex()
-    {
-        VerifyOrDie(mFailSafeArmed);
-        return mFabricIndex;
-    }
+    inline FabricIndex GetFabricIndex() { return mFabricIndex; }
 
 private:
     // ===== Private members reserved for use by this class only.

diff --git a/src/platform/FailSafeContext.cpp b/src/platform/FailSafeContext.cpp
@@ -54,8 +54,10 @@ void FailSafeContext::CommissioningFailedTimerComplete()
 
 CHIP_ERROR FailSafeContext::ArmFailSafe(FabricIndex accessingFabricIndex, System::Clock::Timeout expiryLength)
 {
-    mFailSafeArmed = true;
-    mFabricIndex   = accessingFabricIndex;
+    mFailSafeArmed                  = true;
+    mAddNocCommandHasBeenInvoked    = false;
+    mUpdateNocCommandHasBeenInvoked = false;
+    mFabricIndex                    = accessingFabricIndex;
     DeviceLayer::SystemLayer().StartTimer(expiryLength, HandleArmFailSafe, this);
     return CHIP_NO_ERROR;
 }