Return-Path: Delivered-To: apmail-activemq-camel-commits-archive@locus.apache.org Received: (qmail 35167 invoked from network); 20 Aug 2008 07:12:45 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 20 Aug 2008 07:12:45 -0000 Received: (qmail 38283 invoked by uid 500); 20 Aug 2008 07:12:44 -0000 Delivered-To: apmail-activemq-camel-commits-archive@activemq.apache.org Received: (qmail 38248 invoked by uid 500); 20 Aug 2008 07:12:44 -0000 Mailing-List: contact camel-commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: camel-dev@activemq.apache.org Delivered-To: mailing list camel-commits@activemq.apache.org Received: (qmail 38239 invoked by uid 99); 20 Aug 2008 07:12:44 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Aug 2008 00:12:44 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Aug 2008 07:11:55 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1B17B2388888; Wed, 20 Aug 2008 00:12:25 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r687266 - /activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/MulticastType.java Date: Wed, 20 Aug 2008 07:12:24 -0000 To: camel-commits@activemq.apache.org From: ningjiang@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080820071225.1B17B2388888@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 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);