Author: davsclaus
Date: Mon Feb 21 09:18:48 2011
New Revision: 1072897
URL: http://svn.apache.org/viewvc?rev=1072897&view=rev
Log:
CAMEL-3690: Fixed endpoints not being registers in services to close as
endpoints is enlisted in its own list. This prevents 2x shutdown of endpoints
when Camel shutdown.
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/EndpointShutdownOnceTest.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=1072897&r1=1072896&r2=1072897&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
Mon Feb 21 09:18:48 2011
@@ -891,7 +891,8 @@ public class DefaultCamelContext extends
if (service instanceof IsSingleton) {
singleton = ((IsSingleton) service).isSingleton();
}
- if (singleton) {
+ // do not add endpoints as they have their own list
+ if (singleton && !(service instanceof Endpoint)) {
servicesToClose.add(service);
}
}
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/EndpointShutdownOnceTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/EndpointShutdownOnceTest.java?rev=1072897&view=auto
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/EndpointShutdownOnceTest.java
(added)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/EndpointShutdownOnceTest.java
Mon Feb 21 09:18:48 2011
@@ -0,0 +1,87 @@
+/**
+ * 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.Map;
+
+import junit.framework.TestCase;
+import org.apache.camel.CamelContext;
+import org.apache.camel.Component;
+import org.apache.camel.Consumer;
+import org.apache.camel.Endpoint;
+import org.apache.camel.Processor;
+import org.apache.camel.Producer;
+
+/**
+ * Test that endpoints are only shutdown once when CamelContext is stopping.
+ */
+public class EndpointShutdownOnceTest extends TestCase {
+
+ public void testEndpointShutdown() throws Exception {
+ CamelContext context = new DefaultCamelContext();
+ context.addComponent("my", new MyComponent());
+ context.start();
+
+ MyEndpoint my = context.getEndpoint("my:foo", MyEndpoint.class);
+
+ assertTrue("Should be started", my.getStatus().isStarted());
+
+ context.stop();
+ assertFalse("Should not be started", my.getStatus().isStarted());
+ assertTrue("Should be stopped", my.getStatus().isStopped());
+
+ assertEquals("Should only shutdown once", 1, my.getInvoked());
+ }
+
+ private final class MyComponent extends DefaultComponent {
+
+ protected Endpoint createEndpoint(String uri, String remaining,
Map<String, Object> parameters) throws Exception {
+ return new MyEndpoint(uri, this);
+ }
+ }
+
+ private final class MyEndpoint extends DefaultEndpoint {
+
+ private volatile int invoked;
+
+ private MyEndpoint(String endpointUri, Component component) {
+ super(endpointUri, component);
+ }
+
+ public int getInvoked() {
+ return invoked;
+ }
+
+ public Producer createProducer() throws Exception {
+ return null;
+ }
+
+ public Consumer createConsumer(Processor processor) throws Exception {
+ return null;
+ }
+
+ public boolean isSingleton() {
+ return true;
+ }
+
+ @Override
+ protected void doShutdown() throws Exception {
+ super.doShutdown();
+ invoked++;
+ }
+ }
+}
