Skip to content

Commit b80f3b0

Browse files
committed
SWS-534 - Request JMS correlation id field not used to set response message JMS correlation id
1 parent 4a1762b commit b80f3b0

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

support/src/main/java/org/springframework/ws/transport/jms/JmsReceiverConnection.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,8 @@ void setPostProcessor(MessagePostProcessor postProcessor) {
9292
this.postProcessor = postProcessor;
9393
}
9494

95+
96+
9597
/** Returns the request message for this connection. Returns either a {@link BytesMessage} or a {@link TextMessage}. */
9698
public Message getRequestMessage() {
9799
return requestMessage;
@@ -179,7 +181,11 @@ else if (requestMessage instanceof TextMessage) {
179181
else {
180182
throw new IllegalStateException("Unknown request message type [" + requestMessage + "]");
181183
}
182-
responseMessage.setJMSCorrelationID(requestMessage.getJMSMessageID());
184+
String correlation = requestMessage.getJMSCorrelationID();
185+
if (correlation == null) {
186+
correlation = requestMessage.getJMSMessageID();
187+
}
188+
responseMessage.setJMSCorrelationID(correlation);
183189
}
184190
catch (JMSException ex) {
185191
throw new JmsTransportException("Could not create response message", ex);

0 commit comments

Comments
 (0)