Author: antelder
Date: Thu Mar 10 07:26:17 2011
New Revision: 1080131
URL: http://svn.apache.org/viewvc?rev=1080131&view=rev
Log:
TUSCANY-3843: Apply patch from Benjamin Busjaeger to fix Node.start() throws
NPE after NodeFactory.create(List<?>)
Modified:
tuscany/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
Modified:
tuscany/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java?rev=1080131&r1=1080130&r2=1080131&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
Thu Mar 10 07:26:17 2011
@@ -123,7 +123,9 @@ public class NodeImpl implements Node {
// to read the contributions and create the domain composite
if (contributions == null) {
contributions =
nodeFactory.loadContributions(configuration, context);
+ }
+ if (domainComposite == null) {
domainComposite = nodeFactory.configureNode(configuration,
contributions, context);
this.compositeContext =
