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 2004/12/08 23:55:28 UTC

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

dims        2004/12/08 14:55:28

  Modified:    java/src/org/apache/axis/message MessageElement.java
  Log:
  Fix for AXIS-1608 - Test case fro comparing Axis 1.2 against Axis 1.1
  
  Revision  Changes    Path
  1.190     +9 -7      ws-axis/java/src/org/apache/axis/message/MessageElement.java
  
  Index: MessageElement.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/message/MessageElement.java,v
  retrieving revision 1.189
  retrieving revision 1.190
  diff -u -r1.189 -r1.190
  --- MessageElement.java	22 Nov 2004 23:56:28 -0000	1.189
  +++ MessageElement.java	8 Dec 2004 22:55:28 -0000	1.190
  @@ -2125,14 +2125,16 @@
       }
   
       public Document getOwnerDocument() {
  -        Document doc = super.getOwnerDocument();
  +        Document doc = null;
  +        if (context != null && context.getEnvelope() != null &&
  +                context.getEnvelope().getOwnerDocument() != null) {
  +            doc = context.getEnvelope().getOwnerDocument();
  +        }
  +        if(doc == null) {
  +            doc = super.getOwnerDocument();
  +        }
           if (doc == null) {
  -            if (context != null && context.getEnvelope() != null &&
  -                    context.getEnvelope().getOwnerDocument() != null) {
  -                doc = context.getEnvelope().getOwnerDocument();
  -            } else {
  -                doc = new SOAPDocumentImpl(null);
  -            }
  +            doc = new SOAPDocumentImpl(null);
           }
           return doc;
       }