svn commit: r687266 - /activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/MulticastType.java

[ningjiang]

Author: ningjiang
Date: Wed Aug 20 00:12:24 2008
New Revision: 687266

URL: http://svn.apache.org/viewvc?rev=687266&view=rev
Log:
CAMEL-836 deal with the situation that can't find the strategyRef from the 
context

Modified:
    
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/MulticastType.java

Modified: 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/MulticastType.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/MulticastType.java?rev=687266&r1=687265&r2=687266&view=diff
==============================================================================
--- 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/MulticastType.java
 (original)
+++ 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/MulticastType.java
 Wed Aug 20 00:12:24 2008
@@ -67,12 +67,11 @@
     }
 
     protected Processor createCompositeProcessor(RouteContext routeContext, 
List<Processor> list) {
+        if (aggregationStrategy == null && strategyRef != null) {
+            aggregationStrategy = routeContext.lookup(strategyRef, 
AggregationStrategy.class);
+        }
         if (aggregationStrategy == null) {
-            if (strategyRef == null) {
-                aggregationStrategy = new UseLatestAggregationStrategy();
-            } else {
-                aggregationStrategy = routeContext.lookup(strategyRef, 
AggregationStrategy.class);
-            }
+            aggregationStrategy = new UseLatestAggregationStrategy();
         }
         if (threadPoolRef != null) {
             threadPoolExecutor = routeContext.lookup(threadPoolRef, 
ThreadPoolExecutor.class);