Fix handling of non-permitted messages in ExchangeContext. (#33148)
They should not count as responses, since we don't notify our delegate about
them.
diff --git a/src/messaging/ExchangeContext.cpp b/src/messaging/ExchangeContext.cpp
index 3869ab4..f36a274 100644
--- a/src/messaging/ExchangeContext.cpp
+++ b/src/messaging/ExchangeContext.cpp
@@ -596,21 +596,26 @@
// Set kFlagReceivedAtLeastOneMessage to true since we have received at least one new application level message
SetHasReceivedAtLeastOneMessage(true);
- if (IsResponseExpected())
- {
- // Since we got the response, cancel the response timer.
- CancelResponseTimer();
-
- // If the context was expecting a response to a previously sent message, this message
- // is implicitly that response.
- SetResponseExpected(false);
- }
-
// Don't send messages on to our delegate if our dispatch does not allow
- // those messages.
- if (mDelegate != nullptr && mDispatch.MessagePermitted(payloadHeader.GetProtocolID(), payloadHeader.GetMessageType()))
+ // those messages. Those messages should also not be treated as responses,
+ // since if our delegate is expecting a response we will not notify it about
+ // these messages.
+ if (mDispatch.MessagePermitted(payloadHeader.GetProtocolID(), payloadHeader.GetMessageType()))
{
- return mDelegate->OnMessageReceived(this, payloadHeader, std::move(msgBuf));
+ if (IsResponseExpected())
+ {
+ // Since we got the response, cancel the response timer.
+ CancelResponseTimer();
+
+ // If the context was expecting a response to a previously sent message, this message
+ // is implicitly that response.
+ SetResponseExpected(false);
+ }
+
+ if (mDelegate != nullptr)
+ {
+ return mDelegate->OnMessageReceived(this, payloadHeader, std::move(msgBuf));
+ }
}
DefaultOnMessageReceived(this, payloadHeader.GetProtocolID(), payloadHeader.GetMessageType(), messageCounter,
