cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [1/3] cxf git commit: Also check policies in the AssertionInfoMap for equality
Date Wed, 01 Feb 2017 15:31:35 GMT
Repository: cxf
Updated Branches:
  refs/heads/master 3450d3854 -> e26586ee4


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/e26586ee
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e26586ee
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e26586ee

Branch: refs/heads/master
Commit: e26586ee47bc1f733aaf1439b5421e5e4ee63a00
Parents: 1cded5a
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Wed Feb 1 15:30:15 2017 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Wed Feb 1 15:30:44 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/e26586ee/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());


Mime
View raw message