You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2017/02/01 15:32:03 UTC
[2/3] cxf git commit: Also check policies in the AssertionInfoMap for
equality
Also check policies in the AssertionInfoMap for equality
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/08e90aba
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/08e90aba
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/08e90aba
Branch: refs/heads/3.1.x-fixes
Commit: 08e90abaabf4bbd1f3abfa3f1825dab68c86210e
Parents: fb1c2d9
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Feb 1 15:30:15 2017 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Feb 1 15:31:56 2017 +0000
----------------------------------------------------------------------
.../src/main/java/org/apache/cxf/ws/policy/AssertionInfoMap.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/08e90aba/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionInfoMap.java
----------------------------------------------------------------------
diff --git a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionInfoMap.java b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionInfoMap.java
index bc2e0cb..fd3e848 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionInfoMap.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionInfoMap.java
@@ -102,7 +102,7 @@ public class AssertionInfoMap extends HashMap<QName, Collection<AssertionInfo>>
Collection<AssertionInfo> ail = getAssertionInfo(ass.getName());
boolean found = false;
for (AssertionInfo ai : ail) {
- if (ai.getAssertion().equal(ass)) {
+ if (ai.getAssertion().equal(ass) || ai.getAssertion().equals(ass)) {
found = true;
if (!ai.isAsserted() && !ass.isOptional()) {
errors.add(ass.getName());