1 files changed, 5 insertions, 0 deletions
diff --git a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java
index 7dc1a7639a..38d9973e37 100644
--- a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java
+++ b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java
@@ -185,6 +185,11 @@ public class RuntimeEndpointImpl extends EndpointImpl implements RuntimeEndpoint
         if (compositeContext == null) {
             compositeContext = new CompositeContext(registry, endpointRegistry);
         }
+
+        // if interfaceContractMapper is already initialized then all the rest will be too
+        if (interfaceContractMapper != null) {
+            return;
+        }
         this.registry = registry;
         UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
         this.interfaceContractMapper = utilities.getUtility(InterfaceContractMapper.class);