camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r1215200 - in /camel/trunk/camel-core/src/test/java/org/apache/camel/processor: ChoiceWithEndTest.java RandomLoadBalanceJavaDSLBuilderTest.java SplitWithEndTest.java
Date Fri, 16 Dec 2011 16:02:22 GMT
Author: davsclaus
Date: Fri Dec 16 16:02:22 2011
New Revision: 1215200

URL: http://svn.apache.org/viewvc?rev=1215200&view=rev
Log:
CAMEL-4787: Fixed issue with unit of work may re-wrap route context processor at runtime,
causing an ever growing processor path

Modified:
    camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ChoiceWithEndTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RandomLoadBalanceJavaDSLBuilderTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitWithEndTest.java

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ChoiceWithEndTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ChoiceWithEndTest.java?rev=1215200&r1=1215199&r2=1215200&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ChoiceWithEndTest.java
(original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ChoiceWithEndTest.java
Fri Dec 16 16:02:22 2011
@@ -35,6 +35,7 @@ public class ChoiceWithEndTest extends C
         Navigate<Processor> nav = getRoute("direct://start").navigate();
         List<Processor> node = nav.next();
         node = ((Navigate) node.get(0)).next();
+        node = ((Navigate) node.get(0)).next();
 
         // there should be 4 outputs as the end in the otherwise should
         // ensure that the transform and last send is not within the choice

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RandomLoadBalanceJavaDSLBuilderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RandomLoadBalanceJavaDSLBuilderTest.java?rev=1215200&r1=1215199&r2=1215200&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RandomLoadBalanceJavaDSLBuilderTest.java
(original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RandomLoadBalanceJavaDSLBuilderTest.java
Fri Dec 16 16:02:22 2011
@@ -18,7 +18,6 @@ package org.apache.camel.processor;
 
 import java.util.List;
 
-import org.apache.camel.Channel;
 import org.apache.camel.Navigate;
 import org.apache.camel.Processor;
 import org.apache.camel.Route;
@@ -77,11 +76,16 @@ public class RandomLoadBalanceJavaDSLBui
 
         for (Processor child : nav.next()) {
 
+            if (child instanceof RouteContextProcessor) {
+                child = ((RouteContextProcessor) child).getProcessor();
+            }
+
             if (child instanceof DefaultChannel) {
                 DefaultChannel channel = (DefaultChannel) child;
                 ProcessorDefinition def = channel.getProcessorDefinition();
                 navigateDefinition(def, sb);
             }
+
         }
     }
 

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitWithEndTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitWithEndTest.java?rev=1215200&r1=1215199&r2=1215200&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitWithEndTest.java
(original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitWithEndTest.java
Fri Dec 16 16:02:22 2011
@@ -36,6 +36,7 @@ public class SplitWithEndTest extends Co
         Navigate<Processor> nav = context.getRoutes().get(0).navigate();
         List<Processor> node = nav.next();
         node = ((Navigate) node.get(0)).next();
+        node = ((Navigate) node.get(0)).next();
 
         // there should be 4 outputs as the end in the otherwise should
         // ensure that the transform and last send is not within the choice



Mime
View raw message