Repository: camel Updated Branches: refs/heads/camel-2.16.x f44d8652e -> 63f851c29 refs/heads/camel-2.17.x a4c031b0f -> 2207aafb6 refs/heads/master 1c73dfc5e -> 40cda4711
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/d473d460 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d473d460 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d473d460 Branch: refs/heads/master Commit: d473d460717bdad1633d68fa1b15cf5c749157c0 Parents: 1c73dfc Author: Claus Ibsen <davscl...@apache.org> Authored: Sun Jun 12 10:47:09 2016 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sun Jun 12 10:47:09 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/d473d460/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/d473d460/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
