From 134b64e2c0de3fde79dae0eb81fe26ba074e0e3e Mon Sep 17 00:00:00 2001 From: slaws Date: Tue, 2 Jun 2009 22:35:40 +0000 Subject: TUSCANY-3062 - another work round to get resolution doing something in the domain manager. Still needs work. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@781193 13f79535-47bb-0310-9956-ffa450edef68 --- .../sca/domain/manager/impl/DeployableCompositeCollectionImpl.java | 3 +++ 1 file changed, 3 insertions(+) (limited to 'branches/sca-java-1.x/modules') diff --git a/branches/sca-java-1.x/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java b/branches/sca-java-1.x/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java index 029c8c746b..3dac9b535e 100644 --- a/branches/sca-java-1.x/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java +++ b/branches/sca-java-1.x/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java @@ -195,6 +195,9 @@ public class DeployableCompositeCollectionImpl implements ItemCollection, LocalI QName qname = compositeQName(key); for (Composite deployable: contribution.getDeployables()) { if (qname.equals(deployable.getName())) { + // find the deployable composite + deployable = contribution.getModelResolver().resolveModel(Composite.class, deployable); + if (deployable.isUnresolved()) { throw new NotFoundException(key); } -- cgit v1.2.3