From fb9bf6845595286c631086e32fb2505c06bdd926 Mon Sep 17 00:00:00 2001
From: slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 10 Jun 2011 08:05:58 +0000
Subject: TUSCANY-3867 - Add rethrows back in the start processing as we don;t
 want to blindly carry on starting things (as we do with stop processing)

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1134223 13f79535-47bb-0310-9956-ffa450edef68
---
 .../tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java     | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'sca-java-2.x')

diff --git a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java
index 367c082839..49c72aa267 100644
--- a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java
+++ b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java
@@ -427,6 +427,8 @@ public class CompositeActivatorImpl implements CompositeActivator {
             // is up and running before we try and connect references to services
             
         } catch (Throwable e) {
+            // any providers (binding, implementation, policy) that were started
+            // before the error occured are stopped here
             for (int i = providers.size() - 1; i >= 0; i--) {
                 try {
                     providers.get(i).stop();
@@ -439,6 +441,7 @@ public class CompositeActivatorImpl implements CompositeActivator {
             providers.clear();
         }
 
+        // mark a successful start
         runtimeComponent.setStarted(true);
     }
 
@@ -528,6 +531,7 @@ public class CompositeActivatorImpl implements CompositeActivator {
                 scopedRuntimeComponent.getScopeContainer().start();
             } catch (Throwable ex){
                 Monitor.error(monitor, this, "core-messages", "StartException", ex);
+                rethrow(ex);
             }             
         }
     }
@@ -547,6 +551,7 @@ public class CompositeActivatorImpl implements CompositeActivator {
                     providers.add(policyProvider);
                 } catch (Throwable ex){
                     Monitor.error(monitor, this, "core-messages", "StartException", ex);
+                    rethrow(ex);
                 }                     
             }
         }
@@ -568,6 +573,7 @@ public class CompositeActivatorImpl implements CompositeActivator {
                 compositeContext.getEndpointRegistry().addEndpoint(ep);
             } catch (Throwable ex){
                 Monitor.error(monitor, this, "core-messages", "StartException", ex);
+                rethrow(ex);
             }  
         }
     }
@@ -627,6 +633,7 @@ public class CompositeActivatorImpl implements CompositeActivator {
                         start(compositeContext, epr);
                     } catch (Throwable ex){
                         Monitor.error(monitor, this, "core-messages", "StartException", ex);
+                        rethrow(ex);
                     }  
                 }
             }
-- 
cgit v1.2.3