Skip to content

Commit 3803906

Browse files
jmartinez-silabspull[bot]
authored andcommitted
fix a merge issue by readding mICDEventManager.Init() and .Shutdown() in server.cpp. (#27265)
1 parent 44229b1 commit 3803906

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

src/app/server/Server.cpp

+7
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,10 @@ CHIP_ERROR Server::Init(const ServerInitParams & initParams)
247247
}
248248
#endif // CHIP_CONFIG_ENABLE_SERVER_IM_EVENT
249249

250+
#ifdef CHIP_CONFIG_ENABLE_ICD_SERVER
251+
mICDEventManager.Init(&mICDManager);
252+
#endif // CHIP_CONFIG_ENABLE_ICD_SERVER
253+
250254
// This initializes clusters, so should come after lower level initialization.
251255
InitDataModelHandler();
252256

@@ -484,6 +488,9 @@ void Server::Shutdown()
484488
mAccessControl.Finish();
485489
Access::ResetAccessControlToDefault();
486490
Credentials::SetGroupDataProvider(nullptr);
491+
#ifdef CHIP_CONFIG_ENABLE_ICD_SERVER
492+
mICDEventManager.Shutdown();
493+
#endif // CHIP_CONFIG_ENABLE_ICD_SERVER
487494
mAttributePersister.Shutdown();
488495
// TODO(16969): Remove chip::Platform::MemoryInit() call from Server class, it belongs to outer code
489496
chip::Platform::MemoryShutdown();

0 commit comments

Comments
 (0)