Author: svkrish
Date: Thu Oct 4 10:15:58 2007
New Revision: 581970
URL: http://svn.apache.org/viewvc?rev=581970&view=rev
Log:
fixing the algorithm for macthing policysets defined on bindings at two ends of
a wire
Modified:
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingUtil.java
Modified:
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingUtil.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingUtil.java?rev=581970&r1=581969&r2=581970&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingUtil.java
(original)
+++
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingUtil.java
Thu Oct 4 10:15:58 2007
@@ -35,17 +35,24 @@
*/
class BindingUtil {
private static boolean hasCompatiblePolicySets(Binding refBinding, Binding
svcBinding) {
+ boolean isCompatible = true;;
if ( refBinding instanceof PolicySetAttachPoint && svcBinding
instanceof PolicySetAttachPoint ) {
//TODO : need to add more compatibility checks at the policy
attachment levels
for ( PolicySet svcPolicySet :
((PolicySetAttachPoint)svcBinding).getPolicySets() ) {
+ isCompatible = false;
for ( PolicySet refPolicySet :
((PolicySetAttachPoint)refBinding).getPolicySets() ) {
- if ( !svcPolicySet.equals(refPolicySet) ) {
- return false;
+ if ( svcPolicySet.equals(refPolicySet) ) {
+ isCompatible = true;
+ break;
}
}
+ //if there exists no matching policy set in the reference
binding
+ if ( !isCompatible ) {
+ return isCompatible;
+ }
}
}
- return true;
+ return isCompatible;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
