Author: jim.ma Date: 2011-04-18 22:53:07 -0400 (Mon, 18 Apr 2011) New Revision: 14163 Modified: thirdparty/cxf/branches/cxf-2.3.3-patch-01-jaxwstck/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java Log: [CXF-3458]:Fix AddressingFeature required Client should throw exception when the wsa header is missing in the inbound message Modified: thirdparty/cxf/branches/cxf-2.3.3-patch-01-jaxwstck/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java =================================================================== --- thirdparty/cxf/branches/cxf-2.3.3-patch-01-jaxwstck/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java 2011-04-19 02:51:22 UTC (rev 14162) +++ thirdparty/cxf/branches/cxf-2.3.3-patch-01-jaxwstck/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java 2011-04-19 02:53:07 UTC (rev 14163) @@ -607,8 +607,10 @@ MetadataConstants.USING_ADDRESSING_2006_QNAME }; for (QName type : types) { - if (aim.containsKey(type) && aim.get(type).size() > 0) { - missingWsaHeader = false; + for (AssertionInfo assertInfo : aim.getAssertionInfo(type)) { + if (assertInfo.isAsserted()) { + missingWsaHeader = false; + } } } } @@ -1236,10 +1238,9 @@ ContextUtils.storeMAPFaultName(Names.DUPLICATE_MESSAGE_ID_NAME, message); ContextUtils.storeMAPFaultReason(l7dReason, message); - } - + } valid = false; - } + } } else if (usingAddressingAdvisory) { String reason = BUNDLE.getString("MISSING_ACTION_MESSAGE"); @@ -1250,6 +1251,10 @@ valid = false; } + if (Names.INVALID_CARDINALITY_NAME.equals(ContextUtils.retrieveMAPFaultName(message))) { + valid = false; + } + return valid; } }