You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ff...@apache.org on 2008/09/04 09:03:54 UTC
svn commit: r691888 - in
/servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-cxf-se/src:
main/java/org/apache/servicemix/cxfse/CxfSeEndpoint.java
test/java/org/apache/servicemix/cxfse/CxfSeClientProxyTest.java
Author: ffang
Date: Thu Sep 4 00:03:53 2008
New Revision: 691888
URL: http://svn.apache.org/viewvc?rev=691888&view=rev
Log:
[SM-1354]ServiceMix process spins to 100% CPU on CXF re-deploy
Modified:
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-cxf-se/src/main/java/org/apache/servicemix/cxfse/CxfSeEndpoint.java
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-cxf-se/src/test/java/org/apache/servicemix/cxfse/CxfSeClientProxyTest.java
Modified: servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-cxf-se/src/main/java/org/apache/servicemix/cxfse/CxfSeEndpoint.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/CxfSeEndpoint.java?rev=691888&r1=691887&r2=691888&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-cxf-se/src/main/java/org/apache/servicemix/cxfse/CxfSeEndpoint.java (original)
+++ servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-cxf-se/src/main/java/org/apache/servicemix/cxfse/CxfSeEndpoint.java Thu Sep 4 00:03:53 2008
@@ -284,6 +284,7 @@
JBITransportFactory jbiTransportFactory = (JBITransportFactory) getBus()
.getExtension(ConduitInitiatorManager.class)
.getConduitInitiator(CxfSeComponent.JBI_TRANSPORT_ID);
+ jbiTransportFactory.setDeliveryChannel(null);
jbiTransportFactory.removeDestination(getService().toString()
+ getInterfaceName().toString());
super.stop();
Modified: servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-cxf-se/src/test/java/org/apache/servicemix/cxfse/CxfSeClientProxyTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-cxf-se/src/test/java/org/apache/servicemix/cxfse/CxfSeClientProxyTest.java?rev=691888&r1=691887&r2=691888&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-cxf-se/src/test/java/org/apache/servicemix/cxfse/CxfSeClientProxyTest.java (original)
+++ servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-cxf-se/src/test/java/org/apache/servicemix/cxfse/CxfSeClientProxyTest.java Thu Sep 4 00:03:53 2008
@@ -27,6 +27,8 @@
import junit.framework.TestCase;
import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.transport.ConduitInitiatorManager;
+import org.apache.cxf.transport.jbi.JBITransportFactory;
import org.apache.servicemix.client.DefaultServiceMixClient;
import org.apache.servicemix.jbi.container.JBIContainer;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
@@ -73,7 +75,10 @@
component.getServiceUnitManager().shutDown("target");
component.getServiceUnitManager().undeploy("target", getServiceUnitPath("proxytarget"));
-
+ JBITransportFactory jbiTransportFactory = (JBITransportFactory) component.getBus()
+ .getExtension(ConduitInitiatorManager.class)
+ .getConduitInitiator(CxfSeComponent.JBI_TRANSPORT_ID);
+ assertNull(jbiTransportFactory.getDeliveryChannel());
component.getServiceUnitManager().init("target", getServiceUnitPath("proxytarget"));
component.getServiceUnitManager().start("target");