You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ra...@apache.org on 2013/02/12 18:04:40 UTC
svn commit: r1445266 - in /camel/branches/camel-2.9.x/camel-core/src:
main/java/org/apache/camel/support/ServiceSupport.java
test/java/org/apache/camel/component/vm/VmMultipleContextsStartStopTest.java
Author: raulk
Date: Tue Feb 12 17:04:40 2013
New Revision: 1445266
URL: http://svn.apache.org/r1445266
Log:
CAMEL-6072 Service Shutdown logic may execute N times // CAMEL-6073 Pairs of VM producer-consumer disconnect when OSGi bundle is restarted
Added:
camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/component/vm/VmMultipleContextsStartStopTest.java
- copied unchanged from r1445263, camel/trunk/camel-core/src/test/java/org/apache/camel/component/vm/VmMultipleContextsStartStopTest.java
Modified:
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/support/ServiceSupport.java
Modified: camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/support/ServiceSupport.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/support/ServiceSupport.java?rev=1445266&r1=1445265&r2=1445266&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/support/ServiceSupport.java (original)
+++ camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/support/ServiceSupport.java Tue Feb 12 17:04:40 2013
@@ -145,6 +145,10 @@ public abstract class ServiceSupport imp
@Override
public void shutdown() throws Exception {
+ if (shutdown.get()) {
+ LOG.trace("Service already shut down");
+ return;
+ }
// ensure we are stopped first
stop();