From edebfed62c1b507909fa6d03c7db9ed7e49a9494 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Sun, 27 Jul 2014 09:24:42 -0400 Subject: [PATCH] INT-3420 Aggregator Expiry Doc Clarification JIRA: https://jira.spring.io/browse/INT-3420 New documentation implied that if `expire-groups-upon-timeout` was true, the group would NOT be removed if the group was released by the release strategy in `forceComplete()`. "...if it does so, then expiration is controlled by..." In fact, `afterRelease()` (which is where `expire-groups-upon-completion` is only invoked if `expire-groups-upon-timeout` is false. Clarify that if the release strategy releases the group during timeout then the group will always be expired if `expire-groups-upon-timeout` is true (default). --- src/reference/docbook/aggregator.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/reference/docbook/aggregator.xml b/src/reference/docbook/aggregator.xml index aa41d5e8be..4454321a51 100644 --- a/src/reference/docbook/aggregator.xml +++ b/src/reference/docbook/aggregator.xml @@ -629,7 +629,9 @@ then you should simply provide an implementation of the ReleaseStrate When a group is timed out, the ReleaseStrategy is given - one more opportunity to release the group; if it does so, then expiration is controlled + one more opportunity to release the group; if it does so, and + expire-groups-upon-timeout is false, + then expiration is controlled by expire-groups-upon-completion. If the group is not released by the release strategy during timeout, then the expiration is controlled by the expire-groups-upon-timeout. Timed-out groups are either discarded, or a