Applied patch for TRANSPORTS-43.

apache · Feb 28, 2012 · 48911bda9dd9d4d7430a2815707b821f7a48e0d0 · 48911bd
1 parent d7dac18
commit 48911bda9dd9d4d7430a2815707b821f7a48e0d0
Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSMessageReceiver.java b/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSMessageReceiver.java
@@ -156,7 +156,12 @@ private boolean processThoughEngine(Message message, UserTransaction ut)
         // set the JMS Message ID as the Message ID of the MessageContext
         try {
             msgContext.setMessageID(message.getJMSMessageID());
-            msgContext.setProperty(JMSConstants.JMS_COORELATION_ID, message.getJMSMessageID());
+            String jmsCorrelationID = message.getJMSCorrelationID();
+            if (jmsCorrelationID != null && jmsCorrelationID.length() > 0) {
+                msgContext.setProperty(JMSConstants.JMS_COORELATION_ID, jmsCorrelationID);
+            } else {
+                msgContext.setProperty(JMSConstants.JMS_COORELATION_ID, message.getJMSMessageID());
+            }
         } catch (JMSException ignore) {}
 
         String soapAction = JMSUtils.getProperty(message, BaseConstants.SOAPACTION);

diff --git a/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java b/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java
@@ -226,7 +226,12 @@ private void sendOverJMS(MessageContext msgCtx, JMSMessageSender messageSender,
             } catch (JMSException ignore) {}
 
             try {
-                correlationId = message.getJMSMessageID();
+                String jmsCorrelationID = message.getJMSCorrelationID();
+                if (jmsCorrelationID != null && jmsCorrelationID.length() > 0) {
+                    correlationId = jmsCorrelationID;
+                } else {
+                    correlationId = message.getJMSMessageID();
+                }
             } catch(JMSException ignore) {}
 
             // We assume here that the response uses the same message property to