svn commit: r658260 - in /activemq/camel/trunk/camel-core: pom.xml src/main/java/org/apache/camel/model/MulticastType.java src/test/java/org/apache/camel/processor/MulticastStreamCachingTest.java

[gertv]

Author: gertv
Date: Tue May 20 07:30:35 2008
New Revision: 658260

URL: http://svn.apache.org/viewvc?rev=658260&view=rev
Log:
Fix for MulticastStreamCachingTest after interceptor changes

Modified:
    activemq/camel/trunk/camel-core/pom.xml
    
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/MulticastType.java
    
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastStreamCachingTest.java

Modified: activemq/camel/trunk/camel-core/pom.xml
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/pom.xml?rev=658260&r1=658259&r2=658260&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/pom.xml (original)
+++ activemq/camel/trunk/camel-core/pom.xml Tue May 20 07:30:35 2008
@@ -114,7 +114,6 @@
           <excludes>
             <!-- TODO FIXME ASAP -->
             <exclude>**/InterceptorLogTest.*</exclude>
-            <exclude>**/MulticastStreamCachingTest.*</exclude>
           </excludes>
         </configuration>
       </plugin>

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=658260&r1=658259&r2=658260&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
 Tue May 20 07:30:35 2008
@@ -30,6 +30,7 @@
 import org.apache.camel.processor.MulticastProcessor;
 import org.apache.camel.processor.aggregate.AggregationStrategy;
 import org.apache.camel.processor.aggregate.UseLatestAggregationStrategy;
+import org.apache.camel.processor.interceptor.StreamCachingInterceptor;
 
 /**
  * @version $Revision$
@@ -88,6 +89,6 @@
     @Override
     protected Processor wrapProcessorInInterceptors(RouteContext routeContext, 
Processor target) throws Exception {
         // No need to wrap me in interceptors as they are all applied directly 
to my children
-        return target;
+        return new StreamCachingInterceptor(target);
     }
 }
\ No newline at end of file

Modified: 
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastStreamCachingTest.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastStreamCachingTest.java?rev=658260&r1=658259&r2=658260&view=diff
==============================================================================
--- 
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastStreamCachingTest.java
 (original)
+++ 
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastStreamCachingTest.java
 Tue May 20 07:30:35 2008
@@ -76,7 +76,7 @@
         return new RouteBuilder() {
             public void configure() {
                 //stream caching should fix re-readability issues when 
multicasting messags
-                from("direct:a").streamCaching().multicast().to("direct:x", 
"direct:y", "direct:z");
+                from("direct:a").multicast().to("direct:x", "direct:y", 
"direct:z");
 
                 from("direct:x").process(processor).to("mock:x");
                 from("direct:y").process(processor).to("mock:y");