- added null check to code which was leading to a fatal error if an app is

  built without setting test event trigger delegate mTestEventTriggerDelegate

Author: fessehaeve

examples/smoke-co-alarm-app/silabs/src/AppTask.cpp

@@ -78,7 +78,10 @@ CHIP_ERROR AppTask::Init()
     }
 
     // Register Smoke & Co Test Event Trigger
-    Server::GetInstance().GetTestEventTriggerDelegate()->AddHandler(&AlarmMgr());
+    if (Server::GetInstance().GetTestEventTriggerDelegate() != nullptr)
+    {
+        Server::GetInstance().GetTestEventTriggerDelegate()->AddHandler(&AlarmMgr());
+    }
 
     sAlarmLED.Init(LIGHT_LED);
     sAlarmLED.Set(false);

src/app/server/Server.cpp

@@ -359,7 +359,10 @@ CHIP_ERROR Server::Init(const ServerInitParams & initParams)
                      chip::app::InteractionModelEngine::GetInstance());
 
     // Register Test Event Trigger Handler
-    mTestEventTriggerDelegate->AddHandler(&mICDManager);
+    if (mTestEventTriggerDelegate != nullptr)
+    {
+        mTestEventTriggerDelegate->AddHandler(&mICDManager);
+    }
 
 #endif // CHIP_CONFIG_ENABLE_ICD_SERVER
 
@@ -606,7 +609,10 @@ void Server::Shutdown()
     Credentials::SetGroupDataProvider(nullptr);
 #if CHIP_CONFIG_ENABLE_ICD_SERVER
     // Remove Test Event Trigger Handler
-    mTestEventTriggerDelegate->RemoveHandler(&mICDManager);
+    if (mTestEventTriggerDelegate != nullptr)
+    {
+        mTestEventTriggerDelegate->RemoveHandler(&mICDManager);
+    }
     mICDManager.Shutdown();
 #endif // CHIP_CONFIG_ENABLE_ICD_SERVER
     mAttributePersister.Shutdown();