@@ -152,10 +152,8 @@ CHIP_ERROR ReadHandler::OnStatusResponse(Messaging::ExchangeContext * apExchange
152
152
{
153
153
InteractionModelEngine::GetInstance ()->GetReportingEngine ().OnReportConfirm ();
154
154
MoveToState (HandlerState::GeneratingReports);
155
- if (mpExchangeCtx)
156
- {
157
- mpExchangeCtx->WillSendMessage ();
158
- }
155
+ mpExchangeCtx->WillSendMessage ();
156
+
159
157
// Trigger ReportingEngine run for sending next chunk of data.
160
158
SuccessOrExit (err = InteractionModelEngine::GetInstance ()->GetReportingEngine ().ScheduleRun ());
161
159
}
@@ -363,12 +361,7 @@ CHIP_ERROR ReadHandler::ProcessReadRequest(System::PacketBufferHandle && aPayloa
363
361
364
362
ReturnErrorOnFailure (InteractionModelEngine::GetInstance ()->GetReportingEngine ().ScheduleRun ());
365
363
366
- // mpExchangeCtx can be null here due to
367
- // https://github.com/project-chip/connectedhomeip/issues/8031
368
- if (mpExchangeCtx)
369
- {
370
- mpExchangeCtx->WillSendMessage ();
371
- }
364
+ mpExchangeCtx->WillSendMessage ();
372
365
373
366
// There must be no code after the WillSendMessage() call that can cause
374
367
// this method to return a failure.
@@ -695,12 +688,9 @@ CHIP_ERROR ReadHandler::ProcessSubscribeRequest(System::PacketBufferHandle && aP
695
688
MoveToState (HandlerState::GeneratingReports);
696
689
697
690
InteractionModelEngine::GetInstance ()->GetReportingEngine ().ScheduleRun ();
698
- // mpExchangeCtx can be null here due to
699
- // https://github.com/project-chip/connectedhomeip/issues/8031
700
- if (mpExchangeCtx)
701
- {
702
- mpExchangeCtx->WillSendMessage ();
703
- }
691
+
692
+ mpExchangeCtx->WillSendMessage ();
693
+
704
694
return CHIP_NO_ERROR;
705
695
}
706
696
0 commit comments