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

[dims]

dims        2003/03/25 12:17:35

  Modified:    java/src/org/apache/axis/message SOAPFault.java
  Log:
  Fix for Bug 18321 - NullPointerException with Faults in early invocation stages
  from [EMAIL PROTECTED] (Oliver Adler)
  
  Revision  Changes    Path
  1.16      +8 -3      xml-axis/java/src/org/apache/axis/message/SOAPFault.java
  
  Index: SOAPFault.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/SOAPFault.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- SOAPFault.java    2 Mar 2003 06:36:19 -0000       1.15
  +++ SOAPFault.java    25 Mar 2003 20:17:35 -0000      1.16
  @@ -57,6 +57,7 @@
   import org.apache.axis.AxisFault;
   import org.apache.axis.Constants;
   import org.apache.axis.description.FaultDesc;
  +import org.apache.axis.description.OperationDesc;
   import org.apache.axis.encoding.DeserializationContext;
   import org.apache.axis.encoding.SerializationContext;
   import org.apache.axis.soap.SOAPConstants;
  @@ -180,9 +181,13 @@
               Class cls = fault.getClass();
               QName qname = null;
               if (! cls.equals(AxisFault.class)) {
  -                FaultDesc faultDesc = 
  -                        
context.getMessageContext().getOperation().getFaultByClass(cls);
  -             if (faultDesc != null) {
  +                             FaultDesc faultDesc = null;
  +                OperationDesc op = context.getMessageContext().getOperation();
  +                if(op != null) {
  +                                     faultDesc = op.getFaultByClass(cls);
  +                }
  +                
  +                             if (faultDesc != null) {
                       qname = faultDesc.getQName();
                   }
               }