Fix ICD Manager Init (#29088)

project-chip · Dec 12, 2023 · 1058636 · 1058636
1 parent 8f0e2e5
commit 1058636
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/app/server/Server.cpp b/src/app/server/Server.cpp
@@ -252,14 +252,15 @@ CHIP_ERROR Server::Init(const ServerInitParams & initParams)
     }
 #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);