We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent 0be1ae7 commit b673df5Copy full SHA for b673df5
src/app/server/Server.cpp
@@ -252,14 +252,15 @@ CHIP_ERROR Server::Init(const ServerInitParams & initParams)
252
}
253
#endif // CHIP_CONFIG_ENABLE_SERVER_IM_EVENT
254
255
+ // This initializes clusters, so should come after lower level initialization.
256
+ InitDataModelHandler();
257
+
258
+// ICD Init needs to be after data model init
259
#if CHIP_CONFIG_ENABLE_ICD_SERVER
260
mICDManager.Init(mDeviceStorage, &GetFabricTable(), mReportScheduler);
261
mICDEventManager.Init(&mICDManager);
262
#endif // CHIP_CONFIG_ENABLE_ICD_SERVER
263
- // This initializes clusters, so should come after lower level initialization.
- InitDataModelHandler();
-
264
#if defined(CHIP_APP_USE_ECHO)
265
err = InitEchoHandler(&mExchangeMgr);
266
SuccessOrExit(err);
0 commit comments