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

[gdaniels]

gdaniels    02/03/25 06:22:25

  Modified:    java/src/org/apache/axis/message MessageElement.java
  Log:
  Fix NPE in weird cases where a SerializationContext doesn't have an
  associated MessageContext (testing, mostly).
  
  Revision  Changes    Path
  1.90      +4 -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.89
  retrieving revision 1.90
  diff -u -r1.89 -r1.90
  --- MessageElement.java       25 Mar 2002 04:44:02 -0000      1.89
  +++ MessageElement.java       25 Mar 2002 14:22:25 -0000      1.90
  @@ -620,8 +620,10 @@
            * whatever encoding style is in scope....
            */ 
           if (encodingStyle != null) {
  -            SOAPConstants soapConstants = context.getMessageContext().
  -                                                        getSOAPConstants();
  +            MessageContext mc = context.getMessageContext();
  +            SOAPConstants soapConstants = (mc != null) ?
  +                                            mc.getSOAPConstants() :
  +                                            SOAPConstants.SOAP11_CONSTANTS;
               if (parent == null) {
                   // don't emit an encoding style if its "" (literal)
                   if (!encodingStyle.equals("")) {