From 07e339a0e7dbb8627a3cc602f517827bc54fb41d Mon Sep 17 00:00:00 2001
From: David Syer <dsyer@vmware.com>
Date: Fri, 7 May 2010 08:08:17 +0000
Subject: [PATCH] INT-1075: add another finally block to CMH

---
 .../aggregator/CorrelatingMessageHandler.java | 45 ++++++++++---------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/CorrelatingMessageHandler.java b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/CorrelatingMessageHandler.java
index fb9ac96fe6..bae437ad7d 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/CorrelatingMessageHandler.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/CorrelatingMessageHandler.java
@@ -182,11 +182,14 @@ public class CorrelatingMessageHandler extends AbstractMessageHandler implements
 
 				} else if (group.isComplete()) {
 
-					// If not releasing any messages the group might still be complete
-					for (Message<?> discard : group.getUnmarked()) {
-						discardChannel.send(discard);
+					try {
+						// If not releasing any messages the group might still be complete
+						for (Message<?> discard : group.getUnmarked()) {
+							discardChannel.send(discard);
+						}
+					} finally {
+						remove(group);
 					}
-					remove(group);
 
 				}
 
@@ -206,27 +209,29 @@ public class CorrelatingMessageHandler extends AbstractMessageHandler implements
 
 			if (group.size() > 0) {
 				// last chance for normal completion
-				if (releaseStrategy.canRelease(group)) {
-					outputProcessor.processAndSend(group, channelTemplate, resolveReplyChannel(group.getOne(),
-							this.outputChannel));
-					remove(group);
-				} else {
-					if (sendPartialResultOnExpiry) {
-						if (logger.isInfoEnabled()) {
-							logger.info("Processing partially complete messages for key [" + correlationKey + "] to: "
-									+ outputChannel);
-						}
+				try {
+					if (releaseStrategy.canRelease(group)) {
 						outputProcessor.processAndSend(group, channelTemplate, resolveReplyChannel(group.getOne(),
 								this.outputChannel));
 					} else {
-						if (logger.isInfoEnabled()) {
-							logger.info("Discarding partially complete messages for key [" + correlationKey + "] to: "
-									+ discardChannel);
-						}
-						for (Message<?> message : group.getUnmarked()) {
-							discardChannel.send(message);
+						if (sendPartialResultOnExpiry) {
+							if (logger.isInfoEnabled()) {
+								logger.info("Processing partially complete messages for key [" + correlationKey
+										+ "] to: " + outputChannel);
+							}
+							outputProcessor.processAndSend(group, channelTemplate, resolveReplyChannel(group.getOne(),
+									this.outputChannel));
+						} else {
+							if (logger.isInfoEnabled()) {
+								logger.info("Discarding partially complete messages for key [" + correlationKey
+										+ "] to: " + discardChannel);
+							}
+							for (Message<?> message : group.getUnmarked()) {
+								discardChannel.send(message);
+							}
 						}
 					}
+				} finally {
 					remove(group);
 				}
 				return true;