From 94c82a74def0f1d229e6b31e3b6a2c732f70b273 Mon Sep 17 00:00:00 2001 From: antelder Date: Sun, 4 Mar 2012 21:14:26 +0000 Subject: Fix Deployer.resolve to resolve dependent contributions correctly. It looks like nothing is using Deplyer.resolve except the validateContribution call so this bug had gone unoticed, the code in Deplyer.resove is duplicate din build, really build should just call resolve, i'll do that change in a seperate commit git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1296876 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'sca-java-2.x/trunk/modules/domain-node/src/main') diff --git a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java index 9ee36c1e38..456c4ef7b6 100644 --- a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java +++ b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java @@ -344,7 +344,10 @@ public class NodeImpl implements Node { Monitor monitor = deployer.createMonitor(); try { - deployer.resolve(contribution, calculateDependentContributions(cd), monitor); + ArrayList cs = new ArrayList(); + cs.add(contribution); + cs.addAll(calculateDependentContributions(cd)); + deployer.resolve(cs, null, monitor); } catch (Exception e) { loadedContributions.remove(cd.getURI()); throw new RuntimeException(e); -- cgit v1.2.3