[chip-tool] Properly shutdown all opened commissioners (#20727)

project-chip · Aug 7, 2023 · 1387672 · 1387672
1 parent 77aa79c
commit 1387672
Showing 1 changed file with 2 additions and 9 deletions.
diff --git a/examples/chip-tool/commands/common/CHIPCommand.cpp b/examples/chip-tool/commands/common/CHIPCommand.cpp
@@ -165,16 +165,9 @@ void CHIPCommand::MaybeTearDownStack()
     // since the CHIP thread and event queue have been stopped, preventing any thread
     // races.
     //
-    ShutdownCommissioner(kIdentityNull);
-    ShutdownCommissioner(kIdentityAlpha);
-    ShutdownCommissioner(kIdentityBeta);
-    ShutdownCommissioner(kIdentityGamma);
-
-    std::string name        = GetIdentity();
-    chip::FabricId fabricId = strtoull(name.c_str(), nullptr, 0);
-    if (fabricId >= kIdentityOtherFabricId)
+    for (auto it = mCommissioners.begin(); it != mCommissioners.end(); it++)
     {
-        ShutdownCommissioner(name);
+        ShutdownCommissioner(it->first);
     }
 
     StopTracing();