Restructure the match-options identifying logic

ayeshLK · Aug 27, 2024 · 20e7c2b · 20e7c2b
1 parent b26114c
commit 20e7c2b
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/native/src/main/java/io/ballerina/lib/ibm.ibmmq/CommonUtils.java b/native/src/main/java/io/ballerina/lib/ibm.ibmmq/CommonUtils.java
@@ -319,11 +319,12 @@ public static MQGetMessageOptions getMqGetMsgOptions(GetMessageOptions getMsgOpt
             return mqGetMsgOptions;
         }
 
-        if (Objects.nonNull(matchOptions.messageId())) {
+        if (Objects.nonNull(matchOptions.messageId()) && Objects.nonNull(matchOptions.correlationId())) {
+            mqGetMsgOptions.matchOptions = MQConstants.MQMO_MATCH_MSG_ID | MQConstants.MQMO_MATCH_CORREL_ID;
+        } else if (Objects.nonNull(matchOptions.messageId())) {
             mqGetMsgOptions.matchOptions = MQConstants.MQMO_MATCH_MSG_ID;
-        }
-        if (Objects.nonNull(matchOptions.correlationId())) {
-            mqGetMsgOptions.matchOptions |= MQConstants.MQMO_MATCH_CORREL_ID;
+        } else if (Objects.nonNull(matchOptions.correlationId())){
+            mqGetMsgOptions.matchOptions = MQConstants.MQMO_MATCH_CORREL_ID;
         }
         return mqGetMsgOptions;
     }