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 di...@apache.org on 2002/08/15 13:50:09 UTC

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

dims        2002/08/15 04:50:09

  Modified:    java/src/org/apache/axis/message SOAPHeader.java
  Log:
  "Minor patches to SOAPHeader processing" from "Thomas Sandholm" <sa...@mcs.anl.gov>
  
  Details from Thomas:
  If getHeaderByName was called on the client side when SOAPService was not
  set, this code threw a null pointer exception.
  
  Revision  Changes    Path
  1.54      +7 -3      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.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- SOAPHeader.java	4 Aug 2002 12:56:59 -0000	1.53
  +++ SOAPHeader.java	15 Aug 2002 11:50:09 -0000	1.54
  @@ -61,6 +61,7 @@
   import org.apache.axis.encoding.DeserializationContext;
   import org.apache.axis.encoding.SerializationContext;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.handlers.soap.SOAPService;
   
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.commons.logging.Log;
  @@ -211,11 +212,14 @@
               if (mc != null) {
                   if (header != null) {
                       String actor = header.getActor();
  -                    ArrayList actors = mc.getService().getActors();
  -                    if ((actor != null) &&
  +                    SOAPService soapService = mc.getService();
  +                    if (soapService != null) {
  +                        ArrayList actors = mc.getService().getActors();
  +                        if ((actor != null) && 
                               !Constants.URI_SOAP11_NEXT_ACTOR.equals(actor) &&
                               (actors == null || !actors.contains(actor))) {
  -                        header = null;
  +                            header = null;
  +                      }
                       }
                   }
               }