Author: ffang
Date: Wed Dec 23 04:46:07 2009
New Revision: 893405
URL: http://svn.apache.org/viewvc?rev=893405&view=rev
Log:
[SM-1919]Unable to re-deploy SA if one of SU failed during previous start
Modified:
servicemix/components/shared-libraries/trunk/servicemix-soap/src/main/java/org/apache/servicemix/soap/SoapEndpoint.java
Modified: servicemix/components/shared-libraries/trunk/servicemix-soap/src/main/java/org/apache/servicemix/soap/SoapEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/shared-libraries/trunk/servicemix-soap/src/main/java/org/apache/servicemix/soap/SoapEndpoint.java?rev=893405&r1=893404&r2=893405&view=diff
==============================================================================
--- servicemix/components/shared-libraries/trunk/servicemix-soap/src/main/java/org/apache/servicemix/soap/SoapEndpoint.java
(original)
+++ servicemix/components/shared-libraries/trunk/servicemix-soap/src/main/java/org/apache/servicemix/soap/SoapEndpoint.java
Wed Dec 23 04:46:07 2009
@@ -375,7 +375,17 @@
processor = createConsumerProcessor();
}
}
- processor.init();
+ try {
+ processor.init();
+ } catch (Exception e) {
+ if (!dynamic && getRole() != Role.PROVIDER) {
+ //ensure deregister external endpoint if endpoint init failed so that
+ //it won't block the redeployment with correct endpoint
+ ComponentContext ctx = this.serviceUnit.getComponent().getComponentContext();
+ ctx.deregisterExternalEndpoint(activated);
+ }
+ throw e;
+ }
}
public void start() throws Exception {
|