Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E181918D30 for ; Tue, 2 Feb 2016 18:10:24 +0000 (UTC) Received: (qmail 48169 invoked by uid 500); 2 Feb 2016 18:10:24 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 48098 invoked by uid 500); 2 Feb 2016 18:10:24 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 48089 invoked by uid 99); 2 Feb 2016 18:10:24 -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; Tue, 02 Feb 2016 18:10:24 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A53A1DFCDD; Tue, 2 Feb 2016 18:10:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ay@apache.org To: commits@cxf.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: change the warning-log condition to handle both wsam-namespaces equally Date: Tue, 2 Feb 2016 18:10:24 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/3.1.x-fixes 8709d976f -> d26f7af22 change the warning-log condition to handle both wsam-namespaces equally Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d26f7af2 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d26f7af2 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d26f7af2 Branch: refs/heads/3.1.x-fixes Commit: d26f7af22662873b43e26a40e21477c0546ca13c Parents: 8709d97 Author: Akitoshi Yoshida Authored: Tue Feb 2 18:51:43 2016 +0100 Committer: Akitoshi Yoshida Committed: Tue Feb 2 19:06:58 2016 +0100 ---------------------------------------------------------------------- .../cxf/ws/addressing/policy/AddressingAssertionBuilder.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/d26f7af2/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java ---------------------------------------------------------------------- diff --git a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java index e49dac9..318463d 100644 --- a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java +++ b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java @@ -85,8 +85,8 @@ public class AddressingAssertionBuilder implements AssertionBuilder { policy); } }.build(elem, factory); - if (!MetadataConstants.ADDRESSING_ASSERTION_QNAME.equals(nap.getName())) { - // this happens when neethi fails to recognize the specified addressing policy + if (!(nap instanceof PolicyContainingPrimitiveAssertion || nap instanceof PrimitiveAssertion)) { + // this happens when neethi fails to recognize the specified addressing policy element LOG.warning("Unable to recognize the addressing policy"); } return nap;