From d8f99bcf7d56179eba545890687bb99994cb1728 Mon Sep 17 00:00:00 2001
From: rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 9 Dec 2009 03:56:21 +0000
Subject: 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
---
 .../apache/tuscany/sca/builder/impl/ComponentPolicyBuilderImpl.java   | 3 ++-
 .../apache/tuscany/sca/builder/impl/EndpointReferenceBuilderImpl.java | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'sca-java-2.x/trunk/modules/builder/src/main/java')

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);
 
-- 
cgit v1.2.3