From 4f538657ed8baff04cdf01adff8db3c7e82aa3b9 Mon Sep 17 00:00:00 2001 From: slaws Date: Thu, 23 Jun 2011 12:57:26 +0000 Subject: 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 --- .../java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sca-java-2.x/trunk/modules/assembly-xml/src/main') 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 { -- cgit v1.2.3