1 files changed, 3 insertions, 8 deletions
diff --git a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java
index 2e0c4fea02..19e05f9408 100644
--- a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java
+++ b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java
@@ -232,10 +232,9 @@ public class NodeImpl implements Node {
                 removedContributionURIs.addAll(removeContribution(dependent));
             }
             installedContributions.remove(contributionURI);
-            for (DeployedComposite dc : ic.getDeployedComposites()) {
-                dc.stop();
+            for (String compositeURI : ic.getStartedCompositeURIs()) {
+                ic.stop(compositeURI);
             }
-            ic.getDeployedComposites().clear();
         }
         return removedContributionURIs;
     }
@@ -404,15 +403,11 @@ public class NodeImpl implements Node {
     }
 
     public List<String> getStartedCompositeURIs(String contributionURI) {
-        ArrayList<String> compositeURIs = new ArrayList<String>();
         InstalledContribution ic = installedContributions.get(contributionURI);
         if (ic == null) {
             throw new IllegalArgumentException("no contribution found for: " + contributionURI);
         }
-        for (DeployedComposite dc : ic.getDeployedComposites()) {
-            compositeURIs.add(dc.getURI());
-        }
-        return compositeURIs;
+        return ic.getStartedCompositeURIs();
     }
 
     public List<String> getInstalledContributionURIs() {