Cleanup error messaging around queryid and typebugfix/issue_1720

1 files changed, 6 insertions, 2 deletions

diff --git a/base/src/main/java/com/smartdevicelink/session/BaseSdlSession.java b/base/src/main/java/com/smartdevicelink/session/BaseSdlSession.java
index 42459dfd5..55df1f683 100644
--- a/base/src/main/java/com/smartdevicelink/session/BaseSdlSession.java
+++ b/base/src/main/java/com/smartdevicelink/session/BaseSdlSession.java
@@ -222,12 +222,16 @@ public abstract class BaseSdlSession implements ISdlProtocol, ISecurityInitializ
             return;
         }
 
-        if (receivedHeader.getQueryID() != SecurityQueryID.SEND_HANDSHAKE_DATA
-                || !(receivedHeader.getQueryType() == SecurityQueryType.REQUEST || receivedHeader.getQueryType() == SecurityQueryType.NOTIFICATION)) {
+        if (receivedHeader.getQueryID() != SecurityQueryID.SEND_HANDSHAKE_DATA) {
             DebugTool.logError(TAG, "Security Query module error: Message is not a SEND_HANDSHAKE_DATA REQUEST");
             return;
         }
 
+        if (receivedHeader.getQueryType() == SecurityQueryType.RESPONSE) {
+            DebugTool.logError(TAG, "Security Query module error: Message is a response, which is not supported");
+            return;
+        }
+
         iNumBytes = sdlSecurity.runHandshake(data, dataToRead);
 
         // Assemble a security query payload header for our response