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 2016/06/12 08:54:29 UTC
[3/4] camel git commit: CAMEL-10049: Context scoped processors should
be shutdown when CamelContext is shutting down
CAMEL-10049: Context scoped processors should be shutdown when CamelContext is shutting down
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2207aafb
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2207aafb
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2207aafb
Branch: refs/heads/camel-2.17.x
Commit: 2207aafb6326c80305cb4c835e721d20136b48cb
Parents: a4c031b
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Jun 12 10:47:09 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Jun 12 10:54:01 2016 +0200
----------------------------------------------------------------------
.../camel/processor/DelegateAsyncProcessor.java | 4 ++
.../OnCompletionShutdownProcessorTest.java | 75 ++++++++++++++++++++
2 files changed, 79 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/2207aafb/camel-core/src/main/java/org/apache/camel/processor/DelegateAsyncProcessor.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/DelegateAsyncProcessor.java b/camel-core/src/main/java/org/apache/camel/processor/DelegateAsyncProcessor.java
index 7411b8a..ddca1fe 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/DelegateAsyncProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/DelegateAsyncProcessor.java
@@ -83,6 +83,10 @@ public class DelegateAsyncProcessor extends ServiceSupport implements DelegatePr
ServiceHelper.stopServices(processor);
}
+ protected void doShutdown() throws Exception {
+ ServiceHelper.stopAndShutdownServices(processor);
+ }
+
public void process(Exchange exchange) throws Exception {
AsyncProcessorHelper.process(this, exchange);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/2207aafb/camel-core/src/test/java/org/apache/camel/processor/OnCompletionShutdownProcessorTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/OnCompletionShutdownProcessorTest.java b/camel-core/src/test/java/org/apache/camel/processor/OnCompletionShutdownProcessorTest.java
new file mode 100644
index 0000000..d1846f2
--- /dev/null
+++ b/camel-core/src/test/java/org/apache/camel/processor/OnCompletionShutdownProcessorTest.java
@@ -0,0 +1,75 @@
+/**
+ * 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.processor;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.support.ServiceSupport;
+
+public class OnCompletionShutdownProcessorTest extends ContextTestSupport {
+
+ private MyProcessor processor = new MyProcessor();
+
+ public void testSynchronizeComplete() throws Exception {
+ assertEquals("Started", processor.getStatus().name());
+
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedBodiesReceived("Hello World");
+
+ template.sendBody("direct:start", "Hello World");
+
+ assertMockEndpointsSatisfied();
+
+ context.stop();
+
+ assertEquals("Stopped", processor.getStatus().name());
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ onCompletion().process(processor);
+
+ from("direct:start")
+ .to("mock:result");
+ }
+ };
+ }
+
+ public static class MyProcessor extends ServiceSupport implements Processor {
+
+ public MyProcessor() {
+ }
+
+ public void process(Exchange exchange) throws Exception {
+ exchange.getIn().setBody("Bye World");
+ }
+
+ protected void doStart() throws Exception {
+ // noop
+ }
+
+ protected void doStop() throws Exception {
+ // noop
+ }
+ }
+}
\ No newline at end of file