You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ge...@apache.org on 2008/12/05 10:31:04 UTC
svn commit: r723686 - in /servicemix/smx3/branches/servicemix-3.2:
archetypes/servicemix-cxf-se-wsdl-first-service-unit/
deployables/bindingcomponents/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/
deployables/serviceengines/servicemix-cx...
Author: gertv
Date: Fri Dec 5 01:31:04 2008
New Revision: 723686
URL: http://svn.apache.org/viewvc?rev=723686&view=rev
Log:
SM-1714: Don't shutdown the CXF Bus, only remove it from the ThreadLocal
Modified:
servicemix/smx3/branches/servicemix-3.2/archetypes/servicemix-cxf-se-wsdl-first-service-unit/ (props changed)
servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcComponent.java
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-cxf-se/src/main/java/org/apache/servicemix/cxfse/CxfSeComponent.java
Propchange: servicemix/smx3/branches/servicemix-3.2/archetypes/servicemix-cxf-se-wsdl-first-service-unit/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Dec 5 01:31:04 2008
@@ -1,3 +1,4 @@
.classpath
.project
+.settings
target
Modified: servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcComponent.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcComponent.java?rev=723686&r1=723685&r2=723686&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcComponent.java (original)
+++ servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcComponent.java Fri Dec 5 01:31:04 2008
@@ -90,8 +90,8 @@
@Override
protected void doShutDown() throws Exception {
+ // Bus should no longer be the thread default since the component's threads will end now
if (bus != null) {
- bus.shutdown(true);
BusFactory.setThreadDefaultBus(null);
}
super.doShutDown();
Modified: servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-cxf-se/src/main/java/org/apache/servicemix/cxfse/CxfSeComponent.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-cxf-se/src/main/java/org/apache/servicemix/cxfse/CxfSeComponent.java?rev=723686&r1=723685&r2=723686&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-cxf-se/src/main/java/org/apache/servicemix/cxfse/CxfSeComponent.java (original)
+++ servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-cxf-se/src/main/java/org/apache/servicemix/cxfse/CxfSeComponent.java Fri Dec 5 01:31:04 2008
@@ -83,8 +83,8 @@
@Override
protected void doShutDown() throws Exception {
+ // Bus should no longer be the thread default since the component's threads will end now
if (bus != null) {
- bus.shutdown(true);
BusFactory.setThreadDefaultBus(null);
}
super.doShutDown();