Author: slaws
Date: Fri Jun 10 08:08:21 2011
New Revision: 1134224
URL: http://svn.apache.org/viewvc?rev=1134224&view=rev
Log:
TUSCANY-3867 - If an exception is detected at start time tidy up by stopping
what's been started.
Modified:
tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/DeployedComposite.java
Modified:
tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/DeployedComposite.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/DeployedComposite.java?rev=1134224&r1=1134223&r2=1134224&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/DeployedComposite.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/DeployedComposite.java
Fri Jun 10 08:08:21 2011
@@ -98,9 +98,17 @@ public class DeployedComposite {
}
public void start() throws ActivationException {
- compositeActivator.activate(compositeContext, builtComposite);
- compositeActivator.start(compositeContext, builtComposite);
- domainRegistry.addRunningComposite(contribution.getURI(),
builtComposite);
+ try {
+ compositeActivator.activate(compositeContext, builtComposite);
+ compositeActivator.start(compositeContext, builtComposite);
+ domainRegistry.addRunningComposite(contribution.getURI(),
builtComposite);
+ } catch (ActivationException ex){
+ stop();
+ throw ex;
+ } catch (Exception ex){
+ stop();
+ throw new ActivationException(ex);
+ }
}
public void stop() throws ActivationException {
