Skip to content

Commit b673df5

Browse files
Fix ICD Manager Init (#29088)
1 parent 0be1ae7 commit b673df5

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

src/app/server/Server.cpp

+4-3
Original file line numberDiff line numberDiff line change
@@ -252,14 +252,15 @@ CHIP_ERROR Server::Init(const ServerInitParams & initParams)
252252
}
253253
#endif // CHIP_CONFIG_ENABLE_SERVER_IM_EVENT
254254

255+
// This initializes clusters, so should come after lower level initialization.
256+
InitDataModelHandler();
257+
258+
// ICD Init needs to be after data model init
255259
#if CHIP_CONFIG_ENABLE_ICD_SERVER
256260
mICDManager.Init(mDeviceStorage, &GetFabricTable(), mReportScheduler);
257261
mICDEventManager.Init(&mICDManager);
258262
#endif // CHIP_CONFIG_ENABLE_ICD_SERVER
259263

260-
// This initializes clusters, so should come after lower level initialization.
261-
InitDataModelHandler();
262-
263264
#if defined(CHIP_APP_USE_ECHO)
264265
err = InitEchoHandler(&mExchangeMgr);
265266
SuccessOrExit(err);

0 commit comments

Comments
 (0)