Move nulling out of CHIPDeviceController members closer to where they…

… are shut down. (#7464)
project-chip · Jul 9, 2021 · 217b991 · 217b991
1 parent a5c58dd
commit 217b991
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/controller/CHIPDeviceController.cpp b/src/controller/CHIPDeviceController.cpp
@@ -306,6 +306,9 @@ CHIP_ERROR DeviceController::Shutdown()
     chip::Platform::Delete(mSystemLayer);
 #endif // CONFIG_DEVICE_LAYER
 
+    mSystemLayer = nullptr;
+    mInetLayer   = nullptr;
+
     mState = State::NotInitialized;
 
     // TODO(#6668): Some exchange has leak, shutting down ExchangeManager will cause a assert fail.
@@ -318,8 +321,6 @@ CHIP_ERROR DeviceController::Shutdown()
         mSessionMgr->Shutdown();
     }
 
-    mSystemLayer     = nullptr;
-    mInetLayer       = nullptr;
     mStorageDelegate = nullptr;
 
     ReleaseAllDevices();