From 66147a71abdc1cf6e18ff6bc826a3bbfe1e3f1e3 Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Sat, 31 May 2008 14:34:49 +0000
Subject: [PATCH] Now propagating the 'correlationId' on the aggregation result
 Message's header.

---
 .../integration/router/AggregatingMessageHandler.java          | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/router/AggregatingMessageHandler.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/AggregatingMessageHandler.java
index b74c1d5c48..0d37420f1e 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/router/AggregatingMessageHandler.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/router/AggregatingMessageHandler.java
@@ -241,6 +241,9 @@ public class AggregatingMessageHandler implements MessageHandler, InitializingBe
 			return;
 		}
 		Message<?> result = aggregator.aggregate(messages);
+		if (result.getHeader().getCorrelationId() == null) {
+			result.getHeader().setCorrelationId(correlationId);
+		}
 		MessageChannel replyChannel = this.resolveReplyChannelFromMessage(result);
 		if (replyChannel == null) {
 			replyChannel = this.resolveReplyChannelFromMessage(messages.get(0));