diff options
| author | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2009-12-09 03:56:21 +0000 |
|---|---|---|
| committer | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2009-12-09 03:56:21 +0000 |
| commit | d8f99bcf7d56179eba545890687bb99994cb1728 (patch) | |
| tree | c8989388df4e6a0f0f7fad288111a5021941e17d /sca-java-2.x | |
| parent | 4ca5a7a35bba41f2b70b37545516f9dc6def0840 (diff) | |
Fix the builder problems that cause otest regressions
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@888695 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x')
2 files changed, 5 insertions, 2 deletions
diff --git a/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentPolicyBuilderImpl.java b/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentPolicyBuilderImpl.java index 5e89240965..000c4d2887 100644 --- a/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentPolicyBuilderImpl.java +++ b/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentPolicyBuilderImpl.java @@ -101,7 +101,8 @@ public class ComponentPolicyBuilderImpl { if (model instanceof PolicySubject) { PolicySubject subject = (PolicySubject)model; - if (ignoreExclusiveIntents) { + if (!ignoreExclusiveIntents) { + // The intents are merged and the exclusion check will be done after policySubject.getRequiredIntents().addAll(subject.getRequiredIntents()); } else { Set<Intent> intents = new HashSet<Intent>(); diff --git a/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointReferenceBuilderImpl.java b/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointReferenceBuilderImpl.java index 30babcc08c..336fa05a2c 100644 --- a/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointReferenceBuilderImpl.java +++ b/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointReferenceBuilderImpl.java @@ -424,6 +424,7 @@ public class EndpointReferenceBuilderImpl { targetComponentService, targetBinding, true)); + endpointRef.setBinding(targetBinding); endpointRef.setStatus(EndpointReference.WIRED_TARGET_FOUND_AND_MATCHED); // relying on the registry here to resolve the real endpoint reference.getEndpointReferences().add(endpointRef); @@ -550,7 +551,8 @@ public class EndpointReferenceBuilderImpl { targetComponentService, targetBinding, true)); - endpointRef.setStatus(EndpointReference.WIRED_TARGET_NOT_FOUND); + endpointRef.setBinding(targetBinding); + endpointRef.setStatus(EndpointReference.WIRED_TARGET_FOUND_AND_MATCHED); // relying on the registry here to resolve the real endpoint reference.getEndpointReferences().add(endpointRef); |