svn commit: r1294650 - in /axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms: JMSMessageReceiver.java JMSSender.java

[sagara]

Author: sagara
Date: Tue Feb 28 13:44:20 2012
New Revision: 1294650

URL: http://svn.apache.org/viewvc?rev=1294650&view=rev
Log:
Applied patch for TRANSPORTS-43.

Modified:
    
axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSMessageReceiver.java
    
axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java

Modified: 
axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSMessageReceiver.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSMessageReceiver.java?rev=1294650&r1=1294649&r2=1294650&view=diff
==============================================================================
--- 
axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSMessageReceiver.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSMessageReceiver.java
 Tue Feb 28 13:44:20 2012
@@ -156,7 +156,12 @@ public class JMSMessageReceiver {
         // 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);

Modified: 
axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java?rev=1294650&r1=1294649&r2=1294650&view=diff
==============================================================================
--- 
axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java
 Tue Feb 28 13:44:20 2012
@@ -226,7 +226,12 @@ public class JMSSender extends AbstractT
             } 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