From 0b0155497c8540f17186fe4fb3046d54e96b60c6 Mon Sep 17 00:00:00 2001 From: David Turanski Date: Tue, 6 Dec 2011 19:00:32 -0500 Subject: [PATCH] Changed conversation Id to correspond to handler instance --- .../integration/flow/handler/FlowMessageHandler.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/springframework/integration/flow/handler/FlowMessageHandler.java b/src/main/java/org/springframework/integration/flow/handler/FlowMessageHandler.java index 0e70c8a..79c352d 100644 --- a/src/main/java/org/springframework/integration/flow/handler/FlowMessageHandler.java +++ b/src/main/java/org/springframework/integration/flow/handler/FlowMessageHandler.java @@ -86,12 +86,11 @@ public class FlowMessageHandler extends AbstractReplyProducingMessageHandler { @Override protected Object handleRequestMessage(Message requestMessage) { - UUID conversationId = requestMessage.getHeaders().getId(); - Map flowConversationIdHeader = Collections.singletonMap( - FlowConstants.FLOW_CONVERSATION_ID_HEADER, (Object) conversationId); + String conversationId = this.toString(); + Map flowConversationIdHeader = Collections.singletonMap( + FlowConstants.FLOW_CONVERSATION_ID_HEADER, this.toString()); Message message = MessageBuilder.fromMessage(requestMessage).copyHeaders(flowConversationIdHeader) - .build(); try { @@ -123,11 +122,11 @@ public class FlowMessageHandler extends AbstractReplyProducingMessageHandler { * Internal MessageHandler for the flow response */ private static class ResponseMessageHandler implements MessageHandler { - private final UUID conversationId; + private final String conversationId; private volatile Message response; - public ResponseMessageHandler(UUID conversationId) { + public ResponseMessageHandler(String conversationId) { this.conversationId = conversationId; }