Add the ability to map binding.sca to any bindings in the runtime by configuration

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

1 files changed, 13 insertions, 11 deletions

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 629d39ad3e..e7d2d5d841 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
@@ -558,17 +558,19 @@ public class CompositeActivatorImpl implements CompositeActivator {
     }
 
     public void stop(RuntimeEndpointReference epr) {
-        CompositeContext compositeContext = epr.getCompositeContext();
-        if (compositeContext == null) {
-            throw new IllegalStateException("The endpoint reference is not bound");
-        }
-        compositeContext.getEndpointRegistry().removeEndpointReference(epr);
-        ReferenceBindingProvider bindingProvider = epr.getBindingProvider();
-        if (bindingProvider != null) {
-            bindingProvider.stop();
-        }
-        for (PolicyProvider policyProvider : epr.getPolicyProviders()) {
-            policyProvider.stop();
+        if (epr.isStarted()) {
+            CompositeContext compositeContext = epr.getCompositeContext();
+            if (compositeContext == null) {
+                throw new IllegalStateException("The endpoint reference is not bound");
+            }
+            compositeContext.getEndpointRegistry().removeEndpointReference(epr);
+            ReferenceBindingProvider bindingProvider = epr.getBindingProvider();
+            if (bindingProvider != null) {
+                bindingProvider.stop();
+            }
+            for (PolicyProvider policyProvider : epr.getPolicyProviders()) {
+                policyProvider.stop();
+            }
         }
     }