diff options
| author | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2011-06-23 12:57:26 +0000 |
|---|---|---|
| committer | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2011-06-23 12:57:26 +0000 |
| commit | 4f538657ed8baff04cdf01adff8db3c7e82aa3b9 (patch) | |
| tree | bd3abb29eac6e120e2043a0e0153cd2403180e79 /sca-java-2.x/trunk/modules/assembly-xml | |
| parent | ec7ff637d99ee73994a03d15b41f14a61571922a (diff) | |
TUSCANY-3878 - check policy language equality based on the namspace of the policy element rather than the full element QName
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1138859 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk/modules/assembly-xml')
| -rw-r--r-- | sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java b/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java index 6bf797d957..c65381b9f2 100644 --- a/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java +++ b/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java @@ -224,8 +224,8 @@ public class PolicySetProcessor extends BaseStAXArtifactProcessor implements StA // check that all the policies in the policy set are // expressed in the same language. Compare against the // first expression we added - if ((policySet.getPolicies().size() > 0) && (!policySet.getPolicies().get(0).getName() - .equals(name))) { + if ((policySet.getPolicies().size() > 0) && + (!policySet.getPolicies().get(0).getName().getNamespaceURI().equals(name.getNamespaceURI()))) { error(monitor, "PolicyLanguageMissmatch", reader, policySet.getName(), policySet .getPolicies().get(0).getName(), name); } else { |