Author: dkulp Date: Tue Sep 20 00:53:47 2011 New Revision: 1172932 URL: http://svn.apache.org/viewvc?rev=1172932&view=rev Log: Fix compile error
Modified: camel/branches/camel-2.8.x/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java Modified: camel/branches/camel-2.8.x/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java?rev=1172932&r1=1172931&r2=1172932&view=diff ============================================================================== --- camel/branches/camel-2.8.x/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java (original) +++ camel/branches/camel-2.8.x/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java Tue Sep 20 00:53:47 2011 @@ -55,6 +55,7 @@ public class SpringCamelContext extends ApplicationContextAware { private static final transient Logger LOG = LoggerFactory.getLogger(SpringCamelContext.class); + private static final ThreadLocal<Boolean> NO_START = new ThreadLocal<Boolean>(); private ApplicationContext applicationContext; private EventEndpoint eventEndpoint; @@ -66,6 +67,14 @@ public class SpringCamelContext extends } + public static void setNoStart(boolean b) { + if (b) { + NO_START.set(b); + } else { + NO_START.remove(); + } + } + public static SpringCamelContext springCamelContext(ApplicationContext applicationContext) throws Exception { return springCamelContext(applicationContext, true); } @@ -206,7 +215,8 @@ public class SpringCamelContext extends // publish a ContextRefreshedEvent String maybeStart = System.getProperty("maybeStartCamelContext", "true"); - if ("true".equals(maybeStart)) { + if ("true".equals(maybeStart) + || NO_START.get() == null) { if (!isStarted() && !isStarting()) { start(); } else {