svn commit: r638830 - in /activemq/camel/trunk: camel-core/pom.xml camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java components/camel-juel/pom.xml

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r638830 - in /activemq/camel/trunk: camel-core/pom.xml camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java components/camel-juel/pom.xml

ningjiang
Author: ningjiang
Date: Wed Mar 19 06:42:01 2008
New Revision: 638830

URL: http://svn.apache.org/viewvc?rev=638830&view=rev
Log:
Fixed the build failed that caused by my last commit

Modified:
    activemq/camel/trunk/camel-core/pom.xml
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
    activemq/camel/trunk/components/camel-juel/pom.xml

Modified: activemq/camel/trunk/camel-core/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/pom.xml?rev=638830&r1=638829&r2=638830&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/pom.xml (original)
+++ activemq/camel/trunk/camel-core/pom.xml Wed Mar 19 06:42:01 2008
@@ -109,9 +109,7 @@
         <configuration>
           <forkMode>pertest</forkMode>
           <excludes>
-            <!-- TODO FIXME ASAP -->
-            <exclude>**/RomeksExceptionTest.*</exclude>
-            <exclude>**/SimulatorTest.*</exclude>
+            <!-- TODO FIXME ASAP -->            
             <exclude>**/MultiCastAggregatorTest.*</exclude>
           </excludes>
         </configuration>

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java?rev=638830&r1=638829&r2=638830&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java Wed Mar 19 06:42:01 2008
@@ -22,7 +22,6 @@
 import java.util.Collection;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.Executor;
 import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.RejectedExecutionHandler;
 import java.util.concurrent.ThreadPoolExecutor;
@@ -34,7 +33,6 @@
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.impl.ServiceSupport;
-import org.apache.camel.processor.ThreadProcessor.ProcessCall;
 import org.apache.camel.processor.aggregate.AggregationStrategy;
 import org.apache.camel.util.ExchangeHelper;
 import org.apache.camel.util.ServiceHelper;
@@ -58,10 +56,11 @@
     }
 
     public MulticastProcessor(Collection<Processor> processors, AggregationStrategy aggregationStrategy) {
-        this(processors, null, false, null);
+        this(processors, aggregationStrategy, false, null);
     }
 
     public MulticastProcessor(Collection<Processor> processors, AggregationStrategy aggregationStrategy, boolean parallelProcessing, ThreadPoolExecutor executor) {
+        notNull(processors, "processors");
         this.processors = processors;
         this.aggregationStrategy = aggregationStrategy;
         this.isParallelProcessing = parallelProcessing;
@@ -73,7 +72,7 @@
             }
 
         }
-        notNull(processors, "processors");
+
     }
 
     /**

Modified: activemq/camel/trunk/components/camel-juel/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-juel/pom.xml?rev=638830&r1=638829&r2=638830&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-juel/pom.xml (original)
+++ activemq/camel/trunk/components/camel-juel/pom.xml Wed Mar 19 06:42:01 2008
@@ -82,9 +82,7 @@
         <configuration>
           <childDelegation>false</childDelegation>
           <useFile>true</useFile>
-          <excludes>
-            <!-- TODO FIXME ASAP when camel-core/SimulatorTest works again -->
-            <exclude>**/SimulatorTest.*</exclude>
+          <excludes>            
             <exclude>**/FooTest.*</exclude>
           </excludes>
         </configuration>