You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2009/03/21 01:11:42 UTC

svn commit: r756843 - /tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeFactoryImpl.java

Author: rfeng
Date: Sat Mar 21 00:11:42 2009
New Revision: 756843

URL: http://svn.apache.org/viewvc?rev=756843&view=rev
Log:
Minor clean up

Modified:
    tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeFactoryImpl.java

Modified: tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeFactoryImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeFactoryImpl.java?rev=756843&r1=756842&r2=756843&view=diff
==============================================================================
--- tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeFactoryImpl.java (original)
+++ tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeFactoryImpl.java Sat Mar 21 00:11:42 2009
@@ -166,11 +166,13 @@
     private ConfiguredNodeImplementation getNodeConfiguration(Bundle bundle, String compositeContent) throws Exception {
 
         ConfiguredNodeImplementation configuration = getNodeConfiguration(bundle);
+        if (compositeContent != null) {
 
-        Contribution deploymentContrib = createDeploymentContribution(compositeContent);
+            Contribution deploymentContrib = createDeploymentContribution(compositeContent);
 
-        configuration.setComposite(deploymentContrib.getDeployables().get(0));
-        configuration.getContributions().add(deploymentContrib);
+            configuration.setComposite(deploymentContrib.getDeployables().get(0));
+            configuration.getContributions().add(deploymentContrib);
+        }
 
         return configuration;
     }
@@ -527,23 +529,10 @@
         private Bundle bundle;
         private Composite domainFragementComposite;
         private CompositeActivator compositeActivator;
+        private ConfiguredNodeImplementation configuration;
 
         public NodeImpl(Bundle bundle) {
-            try {
-                // Initialize the runtime
-                init();
-
-                this.bundle = bundle;
-                ConfiguredNodeImplementation configuration = getNodeConfiguration(bundle);
-
-                // Configure the node
-                this.domainFragementComposite = configureNode(configuration);
-                this.compositeActivator = utilities.getUtility(CompositeActivator.class, true);
-                this.compositeActivator.setDomainComposite(domainFragementComposite);
-
-            } catch (Exception e) {
-                throw new ServiceRuntimeException(e);
-            }
+            this(bundle, null);
         }
 
         public NodeImpl(Bundle bundle, String compositeContent) {
@@ -552,7 +541,7 @@
                 init();
 
                 this.bundle = bundle;
-                ConfiguredNodeImplementation configuration = getNodeConfiguration(bundle, compositeContent);
+                this.configuration = getNodeConfiguration(bundle, compositeContent);
 
                 // Configure the node
                 this.domainFragementComposite = configureNode(configuration);
@@ -675,6 +664,8 @@
         public void destroy() {
             this.bundle = null;
             this.domainFragementComposite = null;
+            this.compositeActivator = null;
+            this.configuration = null;
             nodes.remove(this);
         }