diff options
| author | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2011-03-10 07:26:17 +0000 |
|---|---|---|
| committer | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2011-03-10 07:26:17 +0000 |
| commit | 89007f7346f691008b83a8700b509947478a005e (patch) | |
| tree | 7277a81eccbadcb36fc4642a48dec98baef89556 /sca-java-2.x/trunk/modules/node-impl/src/main | |
| parent | ede23a52ed80b0fbe2a6ce0ff9abe9154a532caa (diff) | |
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
Diffstat (limited to 'sca-java-2.x/trunk/modules/node-impl/src/main')
| -rw-r--r-- | sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java | 2 |
1 files changed, 2 insertions, 0 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 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 = |