You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by gd...@apache.org on 2003/03/27 07:01:42 UTC
cvs commit: xml-axis/java/src/org/apache/axis/message SOAPHeaderElement.java SOAPHeader.java
gdaniels 2003/03/26 22:01:42
Modified: java/src/org/apache/axis/message SOAPHeaderElement.java
SOAPHeader.java
Log:
Support null (omitted) actor/role, which is actually not the same thing as "".
Revision Changes Path
1.22 +11 -9 xml-axis/java/src/org/apache/axis/message/SOAPHeaderElement.java
Index: SOAPHeaderElement.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/SOAPHeaderElement.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- SOAPHeaderElement.java 2 Mar 2003 06:36:19 -0000 1.21
+++ SOAPHeaderElement.java 27 Mar 2003 06:01:42 -0000 1.22
@@ -120,9 +120,9 @@
QName roleQName = soapConstants.getRoleAttributeQName();
actor = elem.getAttributeNS(roleQName.getNamespaceURI(),
roleQName.getLocalPart());
- if (actor == null) {
- actor = "";
- }
+// if (actor == null) {
+// actor = "";
+// }
if (soapConstants == SOAPConstants.SOAP12_CONSTANTS) {
String relayVal = elem.getAttributeNS(soapConstants.getEnvelopeURI(),
@@ -173,9 +173,9 @@
QName roleQName = soapConstants.getRoleAttributeQName();
actor = attributes.getValue(roleQName.getNamespaceURI(),
roleQName.getLocalPart());
- if (actor == null) {
- actor = "";
- }
+// if (actor == null) {
+// actor = "";
+// }
if (soapConstants == SOAPConstants.SOAP12_CONSTANTS) {
String relayVal = attributes.getValue(soapConstants.getEnvelopeURI(),
@@ -226,9 +226,11 @@
SOAPConstants soapVer = getEnvelope().getSOAPConstants();
QName roleQName = soapVer.getRoleAttributeQName();
- setAttribute(roleQName.getNamespaceURI(),
- roleQName.getLocalPart(), actor);
-
+ if (actor != null) {
+ setAttribute(roleQName.getNamespaceURI(),
+ roleQName.getLocalPart(), actor);
+ }
+
String val;
if (context.getMessageContext() != null && context.getMessageContext().getSOAPConstants() == SOAPConstants.SOAP12_CONSTANTS)
val = mustUnderstand ? "true" : "false";
1.72 +2 -1 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.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- SOAPHeader.java 20 Mar 2003 13:30:45 -0000 1.71
+++ SOAPHeader.java 27 Mar 2003 06:01:42 -0000 1.72
@@ -184,7 +184,8 @@
// 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(actor) ||
+ if (actor == null ||
+ nextActor.equals(actor) ||
(isSOAP12 &&
Constants.URI_SOAP12_ULTIMATE_ROLE.equals(actor)) ||
(actors != null && actors.contains(actor))) {