1 files changed, 14 insertions, 18 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 0f86ee79ba..7dc1a7639a 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
@@ -58,6 +58,7 @@ import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
 import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
 import org.apache.tuscany.sca.contribution.processor.ValidatingXMLInputFactory;
 import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.core.ExtensionPointRegistryLocator;
 import org.apache.tuscany.sca.core.FactoryExtensionPoint;
 import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.core.assembly.RuntimeAssemblyFactory;
@@ -83,7 +84,6 @@ import org.apache.tuscany.sca.invocation.InvokerAsyncResponse;
 import org.apache.tuscany.sca.invocation.Message;
 import org.apache.tuscany.sca.invocation.MessageFactory;
 import org.apache.tuscany.sca.invocation.Phase;
-import org.apache.tuscany.sca.node.NodeFactory;
 import org.apache.tuscany.sca.provider.BindingProviderFactory;
 import org.apache.tuscany.sca.provider.EndpointAsyncProvider;
 import org.apache.tuscany.sca.provider.EndpointProvider;
@@ -919,23 +919,19 @@ public class RuntimeEndpointImpl extends EndpointImpl implements RuntimeEndpoint
             } else {
             	// In this case, we assume that we're running on a detached (non Tuscany) thread and
             	// as a result we need to connect back to the Tuscany environment...
-            	for( NodeFactory factory : NodeFactory.getNodeFactories() ) {
-            		ExtensionPointRegistry registry = factory.getExtensionPointRegistry();
-            		if( registry != null ) {
-            			this.registry = registry;
-            			UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-                        this.interfaceContractMapper = utilities.getUtility(InterfaceContractMapper.class);
-                        this.serializer = utilities.getUtility(EndpointSerializer.class);
-                        RuntimeEndpointImpl ep = (RuntimeEndpointImpl)serializer.readEndpoint(xml);
-                        // Find the actual Endpoint in the EndpointRegistry
-                        ep = findActualEP( ep, registry );
-                        
-                        if( ep != null ){
-                        	copyFrom( ep );
-                        	break;
-                        } // end if
-            		} // end if
-                } // end for
+                ExtensionPointRegistry registry = ExtensionPointRegistryLocator.getExtensionPointRegistry();
+                if( registry != null ) {
+                    this.registry = registry;
+                    UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
+                    this.interfaceContractMapper = utilities.getUtility(InterfaceContractMapper.class);
+                    this.serializer = utilities.getUtility(EndpointSerializer.class);
+                    RuntimeEndpointImpl ep = (RuntimeEndpointImpl)serializer.readEndpoint(xml);
+                    // Find the actual Endpoint in the EndpointRegistry
+                    ep = findActualEP( ep, registry );
+                    if( ep != null ){
+                        copyFrom( ep );
+                    } // end if
+                } // end if
             } // end if
         } // end if
         super.resolve();