From b80f3b0ec2c378ed53713089559f52b399423d71 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@vmware.com>
Date: Fri, 31 Jul 2009 09:12:03 +0000
Subject: [PATCH] SWS-534 - Request JMS correlation id field not used to set
 response message JMS correlation id

---
 .../ws/transport/jms/JmsReceiverConnection.java           | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/support/src/main/java/org/springframework/ws/transport/jms/JmsReceiverConnection.java b/support/src/main/java/org/springframework/ws/transport/jms/JmsReceiverConnection.java
index 7f36f09e..5740e67b 100644
--- a/support/src/main/java/org/springframework/ws/transport/jms/JmsReceiverConnection.java
+++ b/support/src/main/java/org/springframework/ws/transport/jms/JmsReceiverConnection.java
@@ -92,6 +92,8 @@ public class JmsReceiverConnection extends AbstractReceiverConnection {
         this.postProcessor = postProcessor;
     }
 
+    
+
     /** Returns the request message for this connection. Returns either a {@link BytesMessage} or a {@link TextMessage}. */
     public Message getRequestMessage() {
         return requestMessage;
@@ -179,7 +181,11 @@ public class JmsReceiverConnection extends AbstractReceiverConnection {
             else {
                 throw new IllegalStateException("Unknown request message type [" + requestMessage + "]");
             }
-            responseMessage.setJMSCorrelationID(requestMessage.getJMSMessageID());
+            String correlation = requestMessage.getJMSCorrelationID();
+            if (correlation == null) {
+                correlation = requestMessage.getJMSMessageID();
+            }
+            responseMessage.setJMSCorrelationID(correlation);
         }
         catch (JMSException ex) {
             throw new JmsTransportException("Could not create response message", ex);