From 89007f7346f691008b83a8700b509947478a005e Mon Sep 17 00:00:00 2001 From: antelder Date: Thu, 10 Mar 2011 07:26:17 +0000 Subject: TUSCANY-3843: Apply patch from Benjamin Busjaeger to fix Node.start() throws NPE after NodeFactory.create(List) git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1080131 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java | 2 ++ 1 file changed, 2 insertions(+) (limited to 'sca-java-2.x') 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 350412257c..6d6c98c66f 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 @@ -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 = -- cgit v1.2.3