gdaniels 2002/12/24 09:45:02
Modified: java/src/org/apache/axis/message SOAPHeader.java
Log:
Deal with SOAP 1.2 "none" role
Revision Changes Path
1.66 +9 -4 xml-axis/java/src/org/apache/axis/message/SOAPHeader.java
Index: SOAPHeader.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/SOAPHeader.java,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- SOAPHeader.java 11 Dec 2002 22:38:20 -0000 1.65
+++ SOAPHeader.java 24 Dec 2002 17:45:02 -0000 1.66
@@ -171,14 +171,19 @@
String nextActor = soapVer.getNextRoleURI();
while (i.hasNext()) {
SOAPHeaderElement header = (SOAPHeaderElement)i.next();
+ String actor = header.getActor();
+
+ // Skip it if we're SOAP 1.2 and it's the "none" role.
+ if (isSOAP12 && Constants.URI_SOAP12_NONE_ROLE.equals(actor)) {
+ continue;
+ }
// Always process NEXT's, and then anything else in our list
// For now, also always process ultimateReceiver role if SOAP 1.2
- if (nextActor.equals(header.getActor()) ||
+ if (nextActor.equals(actor) ||
(isSOAP12 &&
- Constants.URI_SOAP12_ULTIMATE_ROLE.equals(
- header.getActor())) ||
- (actors != null && actors.contains(header.getActor()))) {
+ Constants.URI_SOAP12_ULTIMATE_ROLE.equals(actor)) ||
+ (actors != null && actors.contains(actor))) {
results.add(header);
}
}
