commit 4f280cedb4a1d21ed378e1d17874597e31c0397a
author Yufeng Wang <yufengwang@google.com> Mon Jul 25 12:51:13 2022 -0700
committer GitHub <noreply@github.com> Mon Jul 25 19:51:13 2022 +0000
tree 7a1604f5660576e1c2026e2e10745af232c5096a
parent 641e3adf74fe7365d63152202709296cdc2e22b7

Do not setup ConfigurationMgr via PlatformMgr on each platform (#21075)

src/platform/SingletonConfigurationManager.cpp

diff --git a/src/platform/SingletonConfigurationManager.cpp b/src/platform/SingletonConfigurationManager.cpp
index 0658ebf..01122c3 100644
--- a/src/platform/SingletonConfigurationManager.cpp
+++ b/src/platform/SingletonConfigurationManager.cpp
@@ -21,6 +21,7 @@
  */
 
 #include <lib/support/CodeUtils.h>
+#include <platform/ConfigurationManager.h>
 
 namespace chip {
 namespace DeviceLayer {
@@ -37,8 +38,12 @@
 
 ConfigurationManager & ConfigurationMgr()
 {
-    VerifyOrDie(gInstance != nullptr);
-    return *gInstance;
+    if (gInstance != nullptr)
+    {
+        return *gInstance;
+    }
+
+    return ConfigurationMgrImpl();
 }
 
 void SetConfigurationMgr(ConfigurationManager * configurationManager)