Return-Path: <commits-return-44975-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 6C11C200C1D
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Wed,  1 Feb 2017 16:31:37 +0100 (CET)
Received: by cust-asf.ponee.io (Postfix)
	id 69051160B44; Wed,  1 Feb 2017 15:31:37 +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 B2F8C160B43
	for <archive-asf-public@cust-asf.ponee.io>; Wed,  1 Feb 2017 16:31:36 +0100 (CET)
Received: (qmail 12947 invoked by uid 500); 1 Feb 2017 15:31:35 -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 12938 invoked by uid 99); 1 Feb 2017 15:31:35 -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:31:35 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id BB6C3DFC63; Wed,  1 Feb 2017 15:31:35 +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:31:35 -0000
Message-Id: <e9949a4a4bc54cd583aef957ba11915d@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [1/3] cxf git commit: Also check policies in the AssertionInfoMap for
 equality
archived-at: Wed, 01 Feb 2017 15:31:37 -0000

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());