Author: davsclaus
Date: Tue Nov 15 13:14:52 2011
New Revision: 1202167
URL: http://svn.apache.org/viewvc?rev=1202167&view=rev
Log:
CAMEL-4682: Improve restarting CamelContext to ensure lifecycle strategies is
not lost.
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextRestartTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextWithLifecycleStrategyRestartTest.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java?rev=1202167&r1=1202166&r2=1202167&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
Tue Nov 15 13:14:52 2011
@@ -1560,7 +1560,7 @@ public class DefaultCamelContext extends
// shutdown management as the last one
shutdownServices(managementStrategy);
shutdownServices(lifecycleStrategies);
- lifecycleStrategies.clear();
+ // do not clear lifecycleStrategies as we can start Camel again and
get the route back as before
// stop the lazy created so they can be re-created on restart
forceStopLazyInitialization();
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextRestartTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextRestartTest.java?rev=1202167&view=auto
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextRestartTest.java
(added)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextRestartTest.java
Tue Nov 15 13:14:52 2011
@@ -0,0 +1,67 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.impl;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+
+/**
+ *
+ */
+public class DefaultCamelContextRestartTest extends ContextTestSupport {
+
+ public void testRestart() throws Exception {
+ assertTrue(context.getStatus().isStarted());
+ assertFalse(context.getStatus().isStopped());
+ assertEquals(1, context.getRoutes().size());
+
+ getMockEndpoint("mock:result").expectedMessageCount(1);
+ template.sendBody("direct:start", "Hello World");
+ assertMockEndpointsSatisfied();
+
+ // now stop
+ context.stop();
+ assertFalse(context.getStatus().isStarted());
+ assertTrue(context.getStatus().isStopped());
+ assertEquals(0, context.getRoutes().size());
+
+ // now start
+ context.start();
+ assertTrue(context.getStatus().isStarted());
+ assertFalse(context.getStatus().isStopped());
+ assertEquals(1, context.getRoutes().size());
+
+ // must obtain a new template
+ template = context.createProducerTemplate();
+
+ // should still work
+ getMockEndpoint("mock:result").expectedMessageCount(1);
+ template.sendBody("direct:start", "Bye World");
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start").routeId("foo")
+ .to("mock:result");
+ }
+ };
+ }
+}
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextWithLifecycleStrategyRestartTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextWithLifecycleStrategyRestartTest.java?rev=1202167&view=auto
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextWithLifecycleStrategyRestartTest.java
(added)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextWithLifecycleStrategyRestartTest.java
Tue Nov 15 13:14:52 2011
@@ -0,0 +1,155 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.impl;
+
+import java.util.Collection;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.Component;
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Endpoint;
+import org.apache.camel.ErrorHandlerFactory;
+import org.apache.camel.Processor;
+import org.apache.camel.Route;
+import org.apache.camel.Service;
+import org.apache.camel.VetoCamelContextStartException;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.spi.LifecycleStrategy;
+import org.apache.camel.spi.RouteContext;
+
+/**
+ *
+ */
+public class DefaultCamelContextWithLifecycleStrategyRestartTest extends
ContextTestSupport {
+
+ private MyStrategy strategy = new MyStrategy();
+
+ public void testRestart() throws Exception {
+ assertTrue(context.getStatus().isStarted());
+ assertFalse(context.getStatus().isStopped());
+ assertEquals(1, context.getRoutes().size());
+ assertEquals(1, strategy.getCounter().get());
+
+ getMockEndpoint("mock:result").expectedMessageCount(1);
+ template.sendBody("direct:start", "Hello World");
+ assertMockEndpointsSatisfied();
+
+ // now stop
+ context.stop();
+ assertFalse(context.getStatus().isStarted());
+ assertTrue(context.getStatus().isStopped());
+ assertEquals(0, context.getRoutes().size());
+
+ // now start
+ context.start();
+ assertTrue(context.getStatus().isStarted());
+ assertFalse(context.getStatus().isStopped());
+ assertEquals(1, context.getRoutes().size());
+ assertEquals(2, strategy.getCounter().get());
+
+ // must obtain a new template
+ template = context.createProducerTemplate();
+
+ // should still work
+ getMockEndpoint("mock:result").expectedMessageCount(1);
+ template.sendBody("direct:start", "Bye World");
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected CamelContext createCamelContext() throws Exception {
+ CamelContext context = super.createCamelContext();
+ context.addLifecycleStrategy(strategy);
+ return context;
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start").routeId("foo")
+ .to("mock:result");
+ }
+ };
+ }
+
+ private class MyStrategy implements LifecycleStrategy {
+
+ private AtomicInteger counter = new AtomicInteger();
+
+ @Override
+ public void onContextStart(CamelContext context) throws
VetoCamelContextStartException {
+ counter.incrementAndGet();
+ }
+
+ @Override
+ public void onContextStop(CamelContext context) {
+ }
+
+ @Override
+ public void onComponentAdd(String name, Component component) {
+ }
+
+ @Override
+ public void onComponentRemove(String name, Component component) {
+ }
+
+ @Override
+ public void onEndpointAdd(Endpoint endpoint) {
+ }
+
+ @Override
+ public void onEndpointRemove(Endpoint endpoint) {
+ }
+
+ @Override
+ public void onServiceAdd(CamelContext context, Service service, Route
route) {
+ }
+
+ @Override
+ public void onServiceRemove(CamelContext context, Service service,
Route route) {
+ }
+
+ @Override
+ public void onRoutesAdd(Collection<Route> routes) {
+ }
+
+ @Override
+ public void onRoutesRemove(Collection<Route> routes) {
+ }
+
+ @Override
+ public void onRouteContextCreate(RouteContext routeContext) {
+ }
+
+ @Override
+ public void onErrorHandlerAdd(RouteContext routeContext, Processor
errorHandler, ErrorHandlerFactory errorHandlerBuilder) {
+ }
+
+ @Override
+ public void onThreadPoolAdd(CamelContext camelContext,
ThreadPoolExecutor threadPool, String id, String sourceId, String routeId,
String threadPoolProfileId) {
+ }
+
+ public AtomicInteger getCounter() {
+ return counter;
+ }
+ }
+}
