cvs commit: xml-axis/java/src/org/apache/axis/message MessageElement.java

[tomj]

tomj        02/02/22 12:03:03

  Modified:    java/src/org/apache/axis/message MessageElement.java
  Log:
  Fix logic to prevent emitting an encoding style of ""
  unless we are overriding a parent scope.
  
  Revision  Changes    Path
  1.78      +8 -2      xml-axis/java/src/org/apache/axis/message/MessageElement.java
  
  Index: MessageElement.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/MessageElement.java,v
  retrieving revision 1.77
  retrieving revision 1.78
  diff -u -r1.77 -r1.78
  --- MessageElement.java       22 Feb 2002 16:15:55 -0000      1.77
  +++ MessageElement.java       22 Feb 2002 20:03:03 -0000      1.78
  @@ -526,8 +526,14 @@
            * whatever encoding style is in scope....
            */ 
           if (encodingStyle != null) {
  -            if ((parent == null) || 
  -                (!encodingStyle.equals(parent.getEncodingStyle()))) {
  +            if (parent == null) {
  +                // don't emit an encoding style if its "" (literal)
  +                if (!encodingStyle.equals("")) { 
  +                    setAttribute(Constants.URI_CURRENT_SOAP_ENC,
  +                                 Constants.ATTR_ENCODING_STYLE,
  +                                 encodingStyle);
  +                }
  +            } else if (!encodingStyle.equals(parent.getEncodingStyle())) {
                   setAttribute(Constants.URI_CURRENT_SOAP_ENC,
                                Constants.ATTR_ENCODING_STYLE,
                                encodingStyle);