From af8ae9780b27bc14a4c6d47224698b984ddb6a55 Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Wed, 2 Jul 2008 03:28:16 +0000
Subject: [PATCH] Setting correlationId (if not already present) when
 processing aggregated Messages.

---
 .../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 2036fcc231..f905df7572 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
@@ -87,6 +87,9 @@ public class AggregatingMessageHandler extends AbstractMessageBarrierHandler {
 			return new Message<?>[0];
 		}
 		Message<?> result = aggregator.aggregate(messages);
+		if (result.getHeader().getCorrelationId() == null) {
+			result.getHeader().setCorrelationId(correlationId);
+		}
 		return new Message<?>[] { result };
 		
 	}