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 ia...@apache.org on 2004/03/09 09:18:24 UTC

cvs commit: ws-axis/java/src/org/apache/axis/message SOAPBodyElement.java SOAPHeader.java SOAPBody.java SOAPHeaderElement.java

ias         2004/03/09 00:18:24

  Modified:    java/src/org/apache/axis/message SOAPBodyElement.java
                        SOAPHeader.java SOAPBody.java
                        SOAPHeaderElement.java
  Log:
  Bug fix of AXIS-1248 at http://issues.apache.org/jira/secure/ViewIssue.jspa?key=AXIS-1248
  - Prevent NPE during detachNode in case of parent's null.
  
  Revision  Changes    Path
  1.31      +3 -1      ws-axis/java/src/org/apache/axis/message/SOAPBodyElement.java
  
  Index: SOAPBodyElement.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/message/SOAPBodyElement.java,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- SOAPBodyElement.java	25 Feb 2004 14:02:43 -0000	1.30
  +++ SOAPBodyElement.java	9 Mar 2004 08:18:24 -0000	1.31
  @@ -93,7 +93,9 @@
       }
   
       public void detachNode() {
  -        ((SOAPBody)parent).removeBodyElement(this);
  +        if (parent != null) {
  +            ((SOAPBody)parent).removeBodyElement(this);
  +        }
           super.detachNode();
       }
   }
  
  
  
  1.79      +3 -1      ws-axis/java/src/org/apache/axis/message/SOAPHeader.java
  
  Index: SOAPHeader.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/message/SOAPHeader.java,v
  retrieving revision 1.78
  retrieving revision 1.79
  diff -u -r1.78 -r1.79
  --- SOAPHeader.java	25 Feb 2004 14:02:43 -0000	1.78
  +++ SOAPHeader.java	9 Mar 2004 08:18:24 -0000	1.79
  @@ -87,7 +87,9 @@
       }
   
       public void detachNode() {
  -        ((SOAPEnvelope)parent).removeHeaders();
  +        if (parent != null) {
  +            ((SOAPEnvelope)parent).removeHeaders();
  +        }
           super.detachNode();
       }
   
  
  
  
  1.49      +3 -1      ws-axis/java/src/org/apache/axis/message/SOAPBody.java
  
  Index: SOAPBody.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/message/SOAPBody.java,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- SOAPBody.java	25 Feb 2004 14:02:43 -0000	1.48
  +++ SOAPBody.java	9 Mar 2004 08:18:24 -0000	1.49
  @@ -91,7 +91,9 @@
       }
   
       public void detachNode() {
  -        ((SOAPEnvelope)parent).removeBody();
  +        if (parent != null) {
  +            ((SOAPEnvelope)parent).removeBody();
  +        }
           super.detachNode();
       }
      
  
  
  
  1.30      +3 -1      ws-axis/java/src/org/apache/axis/message/SOAPHeaderElement.java
  
  Index: SOAPHeaderElement.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/message/SOAPHeaderElement.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- SOAPHeaderElement.java	25 Feb 2004 14:02:43 -0000	1.29
  +++ SOAPHeaderElement.java	9 Mar 2004 08:18:24 -0000	1.30
  @@ -110,7 +110,9 @@
       }
   
       public void detachNode() {
  -        ((SOAPHeader)parent).removeHeader(this);
  +        if (parent != null) {
  +            ((SOAPHeader)parent).removeHeader(this);
  +        }
           super.detachNode();
       }