summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Keeler <jacob.keeler@livioradio.com>2020-02-17 15:41:07 -0500
committerGitHub <noreply@github.com>2020-02-17 15:41:07 -0500
commitb281c67f167f385aabbb232333ddc8cef65172d7 (patch)
tree2f1f680f1a89f76c0c10a97bd06bb7cf614f9d7b
parent98512ab18b805751118907e77b910a8a44cf69c0 (diff)
parent610c3d8458a12a07955f0a39ade724216d4eae5e (diff)
downloadsdl_core-b281c67f167f385aabbb232333ddc8cef65172d7.tar.gz
Merge pull request #3241 from smartdevicelink/fix/hash_id_rejected_params
Properly populate rejectedParams for EndServiceNACK
-rw-r--r--src/components/protocol_handler/src/protocol_handler_impl.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/components/protocol_handler/src/protocol_handler_impl.cc b/src/components/protocol_handler/src/protocol_handler_impl.cc
index 3b216c273c..04c1529573 100644
--- a/src/components/protocol_handler/src/protocol_handler_impl.cc
+++ b/src/components/protocol_handler/src/protocol_handler_impl.cc
@@ -1586,7 +1586,8 @@ RESULT_CODE ProtocolHandlerImpl::HandleControlMessageEndSession(
<< " type.");
if (packet.protocol_version() >= PROTOCOL_VERSION_5) {
std::vector<std::string> rejectedParams;
- if (hash_id == protocol_handler::HASH_ID_WRONG) {
+ if (hash_id == protocol_handler::HASH_ID_WRONG &&
+ packet.service_type() == kRpc) {
rejectedParams.push_back(std::string(strings::hash_id));
}
SendEndSessionNAck(connection_id,