You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ay...@apache.org on 2016/01/19 19:04:05 UTC
cxf git commit: remove unused code for handling wsa-2007/05 namespace
Repository: cxf
Updated Branches:
refs/heads/master 656662827 -> b0227b307
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/b0227b30
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b0227b30
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b0227b30
Branch: refs/heads/master
Commit: b0227b307c453a750215c59438a896afaccb333b
Parents: 6566628
Author: Akitoshi Yoshida <ay...@apache.org>
Authored: Tue Jan 19 19:01:54 2016 +0100
Committer: Akitoshi Yoshida <ay...@apache.org>
Committed: Tue Jan 19 19:03:56 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/b0227b30/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 afa174e..7e166b2 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
@@ -301,12 +301,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);
}
}
}
@@ -340,18 +338,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)) {