You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2012/01/19 15:35:11 UTC
svn commit: r1233404 - in /camel/branches/camel-2.9.x: ./
camel-core/src/test/java/org/apache/camel/component/vm/AbstractVmTestSupport.java
Author: davsclaus
Date: Thu Jan 19 14:35:10 2012
New Revision: 1233404
URL: http://svn.apache.org/viewvc?rev=1233404&view=rev
Log:
CAMEL-4911: SedaConsumer should not poll if CamelContext is starting.
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/component/vm/AbstractVmTestSupport.java
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 19 14:35:10 2012
@@ -1 +1 @@
-/camel/trunk:1227209,1227212,1227540,1228015,1228027,1228223,1228879,1229565,1231135,1231704,1232309,1232312,1232429,1232763,1232782,1232834,1233183,1233259,1233269
+/camel/trunk:1227209,1227212,1227540,1228015,1228027,1228223,1228879,1229565,1231135,1231704,1232309,1232312,1232429,1232763,1232782,1232834,1233183,1233259,1233269,1233398
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jan 19 14:35:10 2012
@@ -1 +1 @@
-/camel/trunk:1-1227196,1227209,1227212,1227540,1228015,1228027,1228223,1228879,1229565,1231135,1231704,1232309,1232312,1232429,1232763,1232782,1232834,1233183,1233259,1233269
+/camel/trunk:1-1227196,1227209,1227212,1227540,1228015,1228027,1228223,1228879,1229565,1231135,1231704,1232309,1232312,1232429,1232763,1232782,1232834,1233183,1233259,1233269,1233398
Modified: camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/component/vm/AbstractVmTestSupport.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/component/vm/AbstractVmTestSupport.java?rev=1233404&r1=1233403&r2=1233404&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/component/vm/AbstractVmTestSupport.java (original)
+++ camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/component/vm/AbstractVmTestSupport.java Thu Jan 19 14:35:10 2012
@@ -39,15 +39,15 @@ public abstract class AbstractVmTestSupp
super.setUp();
context2 = new DefaultCamelContext();
+ template2 = context2.createProducerTemplate();
+ ServiceHelper.startServices(template2, context2);
+
+ // add routes after CamelContext has been started
RouteBuilder routeBuilder = createRouteBuilderForSecondContext();
if (routeBuilder != null) {
- context2.addRoutes(routeBuilder);
+ context2.addRoutes(routeBuilder);
}
-
- template2 = context2.createProducerTemplate();
-
- ServiceHelper.startServices(template2, context2);
}
@Override