Author: davsclaus
Date: Tue Sep 28 06:45:37 2010
New Revision: 1002037
URL: http://svn.apache.org/viewvc?rev=1002037&view=rev
Log:
CAMEL-3159: discard on timeout in Aggregate EIP. Added test with hawtdb as well.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java?rev=1002037&r1=1002036&r2=1002037&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
Tue Sep 28 06:45:37 2010
@@ -369,10 +369,10 @@ public class AggregateProcessor extends
aggregationRepository.confirm(exchange.getContext(),
exchange.getExchangeId());
// and remove redelivery state as well
redeliveryState.remove(exchange.getExchangeId());
- return;
+ } else {
+ // the aggregated exchange should be published (sent out)
+ onSubmitCompletion(key, exchange);
}
-
- onSubmitCompletion(key, exchange);
}
private void onSubmitCompletion(final Object key, final Exchange exchange)
{
