From 3d0ffd2e7b79b1c1509fa0753dbba7f4e969fa80 Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@vmware.com>
Date: Fri, 30 Nov 2012 15:56:21 -0500
Subject: [PATCH] INT-2833 Fix Test Race Condition

Empty message group expiry used a < test instead of <=. This caused
the group in the test to be not deleted when it was expected to be.
---
 .../aggregator/AbstractCorrelatingMessageHandler.java           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/AbstractCorrelatingMessageHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/AbstractCorrelatingMessageHandler.java
index d589a2e920..660ef818c4 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/AbstractCorrelatingMessageHandler.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/AbstractCorrelatingMessageHandler.java
@@ -290,7 +290,7 @@ public abstract class AbstractCorrelatingMessageHandler extends AbstractMessageH
 						 * groups. A longer timeout for empty groups can be enabled by
 						 * setting minimumTimeoutForEmptyGroups.
 						 */
-						removeGroup = lastModifiedNow < (System.currentTimeMillis() - this.minimumTimeoutForEmptyGroups);
+						removeGroup = lastModifiedNow <= (System.currentTimeMillis() - this.minimumTimeoutForEmptyGroups);
 						if (removeGroup && logger.isDebugEnabled()) {
 							logger.debug("Removing empty group: " + group.getGroupId());
 						}