Return-Path: <commits-return-44979-archive-asf-public=cust-asf.ponee.io@cxf.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id 91384200C32
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Wed,  1 Feb 2017 16:32:04 +0100 (CET)
Received: by cust-asf.ponee.io (Postfix)
	id 8FCCC160B43; Wed,  1 Feb 2017 15:32:04 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id C8654160B44
	for <archive-asf-public@cust-asf.ponee.io>; Wed,  1 Feb 2017 16:32:03 +0100 (CET)
Received: (qmail 13608 invoked by uid 500); 1 Feb 2017 15:32:02 -0000
Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cxf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cxf.apache.org>
List-Post: <mailto:commits@cxf.apache.org>
List-Id: <commits.cxf.apache.org>
Reply-To: dev@cxf.apache.org
Delivered-To: mailing list commits@cxf.apache.org
Received: (qmail 13591 invoked by uid 99); 1 Feb 2017 15:32:02 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Feb 2017 15:32:02 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id D3014DFCDD; Wed,  1 Feb 2017 15:32:02 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: coheigea@apache.org
To: commits@cxf.apache.org
Date: Wed, 01 Feb 2017 15:32:03 -0000
Message-Id: <cdca65c51bfe4a37b3dfa8a218f0bc56@git.apache.org>
In-Reply-To: <352aba5063824c799dd2a7dd235f21cf@git.apache.org>
References: <352aba5063824c799dd2a7dd235f21cf@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [2/3] cxf git commit: Also check policies in the AssertionInfoMap for
 equality
archived-at: Wed, 01 Feb 2017 15:32:04 -0000

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 <coheigea@apache.org>
Authored: Wed Feb 1 15:30:15 2017 +0000
Committer: Colm O hEigeartaigh <coheigea@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());