Properly shut down the exchange manager when shutting down system sta…

…te. (project-chip#10359) The leak that caused us to not do this before seems to be fixed with the exchange lifetime work that has happened since. Fixes project-chip#6668
mrjerryjohns · Oct 11, 2021 · 59816ff · 59816ff
1 parent 893fc08
commit 59816ff
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/src/controller/CHIPDeviceControllerFactory.cpp b/src/controller/CHIPDeviceControllerFactory.cpp
@@ -235,11 +235,10 @@ CHIP_ERROR DeviceControllerSystemState::Shutdown()
     ReturnErrorOnFailure(DeviceLayer::PlatformMgr().Shutdown());
 #endif
 
-    // TODO(#6668): Some exchange has leak, shutting down ExchangeManager will cause a assert fail.
-    // if (mExchangeMgr != nullptr)
-    // {
-    //     mExchangeMgr->Shutdown();
-    // }
+    if (mExchangeMgr != nullptr)
+    {
+        mExchangeMgr->Shutdown();
+    }
     if (mSessionMgr != nullptr)
     {
         mSessionMgr->Shutdown();