svn commit: r723970 - in /activemq/camel/trunk/camel-core/src: main/java/org/apache/camel/model/ProcessorType.java test/java/org/apache/camel/processor/aggregator/AggregatorAndOnExceptionTest.java

[davsclaus]

Author: davsclaus
Date: Sat Dec  6 03:03:40 2008
New Revision: 723970

URL: http://svn.apache.org/viewvc?rev=723970&view=rev
Log:
CAMEL-1150: Fixed aggregator not working with onException in a route

Modified:
    
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java
    
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregatorAndOnExceptionTest.java

Modified: 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java?rev=723970&r1=723969&r2=723970&view=diff
==============================================================================
--- 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java
 (original)
+++ 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java
 Sat Dec  6 03:03:40 2008
@@ -25,7 +25,6 @@
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.Executor;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
@@ -38,7 +37,6 @@
 import org.apache.camel.Predicate;
 import org.apache.camel.Processor;
 import org.apache.camel.Route;
-import org.apache.camel.util.CollectionHelper;
 import org.apache.camel.builder.DataFormatClause;
 import org.apache.camel.builder.DeadLetterChannelBuilder;
 import org.apache.camel.builder.ErrorHandlerBuilder;
@@ -61,6 +59,7 @@
 import org.apache.camel.spi.InterceptStrategy;
 import org.apache.camel.spi.Policy;
 import org.apache.camel.spi.RouteContext;
+import org.apache.camel.util.CollectionHelper;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Modified: 
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregatorAndOnExceptionTest.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregatorAndOnExceptionTest.java?rev=723970&r1=723969&r2=723970&view=diff
==============================================================================
--- 
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregatorAndOnExceptionTest.java
 (original)
+++ 
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregatorAndOnExceptionTest.java
 Sat Dec  6 03:03:40 2008
@@ -49,15 +49,15 @@
                 onException(CamelException.class).maximumRedeliveries(2);
 
                 from("seda:start")
-                        .aggregate(new 
PredicateAggregationCollection(header("id"),
-                                        new AggregationStrategy() {
-                                            public Exchange aggregate(Exchange 
oldExchange, Exchange newExchange) {
-                                                return newExchange;
-                                            }
-                                        },
-                                        
header(Exchange.AGGREGATED_COUNT).isEqualTo(2)))
-                        .batchTimeout(500L)
-                        .to("mock:result");
+                    .aggregate(new PredicateAggregationCollection(header("id"),
+                        new AggregationStrategy() {
+                            public Exchange aggregate(Exchange oldExchange, 
Exchange newExchange) {
+                                return newExchange;
+                            }
+                        },
+                        header(Exchange.AGGREGATED_COUNT).isEqualTo(2)))
+                    .batchTimeout(500L)
+                    .to("mock:result");
             }
         };
     }