TUSCANY-3867 - If an exception is detected at start time tidy up by stopping what's been started.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1134224 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 11 insertions, 3 deletions

diff --git a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/DeployedComposite.java b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/DeployedComposite.java
index 7eba965b1a..21d20ff6a1 100644
--- a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/DeployedComposite.java
+++ b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/DeployedComposite.java
@@ -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 {