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 CD40D188A6 for ; Wed, 20 Jan 2016 09:37:56 +0000 (UTC) Received: (qmail 90129 invoked by uid 500); 20 Jan 2016 09:37:56 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 90070 invoked by uid 500); 20 Jan 2016 09:37:56 -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 90059 invoked by uid 99); 20 Jan 2016 09:37:56 -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, 20 Jan 2016 09:37:56 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 86154DFF93; Wed, 20 Jan 2016 09:37:56 +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: remove unused code for handling wsa-2007/05 namespace Date: Wed, 20 Jan 2016 09:37:56 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/3.0.x-fixes e792331d7 -> c560e2814 remove unused code for handling wsa-2007/05 namespace Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c560e281 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c560e281 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c560e281 Branch: refs/heads/3.0.x-fixes Commit: c560e281409aa0ac327690c1fcec8ad64ecd733b Parents: e792331 Author: Akitoshi Yoshida Authored: Tue Jan 19 19:01:54 2016 +0100 Committer: Akitoshi Yoshida Committed: Wed Jan 20 10:37:32 2016 +0100 ---------------------------------------------------------------------- .../apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/c560e281/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java ---------------------------------------------------------------------- diff --git a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java index 15ca563..c746896 100644 --- a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java +++ b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java @@ -309,12 +309,10 @@ public class MAPAggregatorImpl extends MAPAggregator { for (QName type : types) { assertAssertion(aim, type); + // ADDRESSING_ASSERTION is normalized, so check only the default namespace if (type.equals(MetadataConstants.ADDRESSING_ASSERTION_QNAME)) { assertAssertion(aim, MetadataConstants.ANON_RESPONSES_ASSERTION_QNAME); assertAssertion(aim, MetadataConstants.NON_ANON_RESPONSES_ASSERTION_QNAME); - } else if (type.equals(MetadataConstants.ADDRESSING_ASSERTION_QNAME_0705)) { - assertAssertion(aim, MetadataConstants.ANON_RESPONSES_ASSERTION_QNAME_0705); - assertAssertion(aim, MetadataConstants.NON_ANON_RESPONSES_ASSERTION_QNAME_0705); } } } @@ -348,18 +346,13 @@ public class MAPAggregatorImpl extends MAPAggregator { for (QName type : types) { assertAssertion(aim, type); + // ADDRESSING_ASSERTION is normalized, so check only the default namespace if (type.equals(MetadataConstants.ADDRESSING_ASSERTION_QNAME)) { if (onlyAnonymous) { assertAssertion(aim, MetadataConstants.ANON_RESPONSES_ASSERTION_QNAME); } else if (!hasAnonymous) { assertAssertion(aim, MetadataConstants.NON_ANON_RESPONSES_ASSERTION_QNAME); } - } else if (type.equals(MetadataConstants.ADDRESSING_ASSERTION_QNAME_0705)) { - if (onlyAnonymous) { - assertAssertion(aim, MetadataConstants.ANON_RESPONSES_ASSERTION_QNAME_0705); - } else if (!hasAnonymous) { - assertAssertion(aim, MetadataConstants.NON_ANON_RESPONSES_ASSERTION_QNAME_0705); - } } } if (!MessageUtils.isRequestor(message) && !MessageUtils.isOutbound(message)) {