commit b673df57950f3ed13911c041e927086bf235dc59
author Jean-Francois Penven <67962328+jepenven-silabs@users.noreply.github.com> Wed Sep 06 14:39:47 2023 -0400
committer GitHub <noreply@github.com> Wed Sep 06 18:39:47 2023 +0000
tree 6f922a69545863cca2cef2b0cde565a7c5b22045
parent 0be1ae75eb3e76519cefdc611534b8c9b8243d99

Fix ICD Manager Init (#29088)

src/app/server/Server.cpp

diff --git a/src/app/server/Server.cpp b/src/app/server/Server.cpp
index f7d8d24..81ac0b1 100644
--- a/src/app/server/Server.cpp
+++ b/src/app/server/Server.cpp
@@ -252,14 +252,15 @@
     }
 #endif // CHIP_CONFIG_ENABLE_SERVER_IM_EVENT
 
+    // This initializes clusters, so should come after lower level initialization.
+    InitDataModelHandler();
+
+// ICD Init needs to be after data model init
 #if CHIP_CONFIG_ENABLE_ICD_SERVER
     mICDManager.Init(mDeviceStorage, &GetFabricTable(), mReportScheduler);
     mICDEventManager.Init(&mICDManager);
 #endif // CHIP_CONFIG_ENABLE_ICD_SERVER
 
-    // This initializes clusters, so should come after lower level initialization.
-    InitDataModelHandler();
-
 #if defined(CHIP_APP_USE_ECHO)
     err = InitEchoHandler(&mExchangeMgr);
     SuccessOrExit(err);