Performance enhancement - only look up factories when required

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

1 files changed, 8 insertions, 7 deletions

diff --git a/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java b/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
index 6d6c98c66f..b0342ec37d 100644
--- a/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
+++ b/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
@@ -104,13 +104,6 @@ public class NodeImpl implements Node {
         nodeFactory.addNode(configuration, this);
         this.proxyFactory = nodeFactory.proxyFactory;
         
-        DomainRegistryFactory domainRegistryFactory = ExtensibleDomainRegistryFactory.getInstance(nodeFactory.registry);
-        EndpointRegistry endpointRegistry =
-            domainRegistryFactory.getEndpointRegistry(configuration.getDomainRegistryURI(), configuration
-                .getDomainURI());
-        
-        UtilityExtensionPoint utilities = nodeFactory.registry.getExtensionPoint(UtilityExtensionPoint.class);
-        this.compositeActivator = utilities.getUtility(CompositeActivator.class);
         try {
             Monitor monitor = nodeFactory.monitorFactory.createMonitor();
             ProcessorContext context = new ProcessorContext(monitor);
@@ -126,8 +119,16 @@ public class NodeImpl implements Node {
                 }
               
                 if (domainComposite == null) {  
+                    
+                    UtilityExtensionPoint utilities = nodeFactory.registry.getExtensionPoint(UtilityExtensionPoint.class);
+                    this.compositeActivator = utilities.getUtility(CompositeActivator.class);
+
                     domainComposite = nodeFactory.configureNode(configuration, contributions, context);
     
+                    DomainRegistryFactory domainRegistryFactory = ExtensibleDomainRegistryFactory.getInstance(nodeFactory.registry);
+                    EndpointRegistry endpointRegistry =
+                        domainRegistryFactory.getEndpointRegistry(configuration.getDomainRegistryURI(), configuration.getDomainURI());
+
                     this.compositeContext =
                         new CompositeContext(nodeFactory.registry, 
                                              endpointRegistry,