cvs commit: xml-xindice/java/src/org/apache/xindice/xml/dom DocumentImpl.java

[vgritsenko]

vgritsenko    2004/05/19 18:35:58

  Modified:    .        status.xml
               java/src/org/apache/xindice/xml/dom DocumentImpl.java
  Log:
  fix bug 28317: NPE in importNamespaces
  
  Revision  Changes    Path
  1.43      +8 -0      xml-xindice/status.xml
  
  Index: status.xml
  ===================================================================
  RCS file: /home/cvs/xml-xindice/status.xml,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- status.xml        8 Apr 2004 12:30:44 -0000       1.42
  +++ status.xml        20 May 2004 01:35:58 -0000      1.43
  @@ -73,6 +73,14 @@
       </todo>
   
       <changes>
  +        <release version="1.1b5-dev">
  +            <action dev="VG" type="fix" fixes-bug="28317" due-to="Dominic 
Battre">
  +                Fixed NullPointerException in importNamespaces.
  +            </action>
  +            <action dev="VG" type="fix" fixes-bug="28783">
  +                Fixed bug in flushing database configuration to the disk.
  +            </action>
  +        </release>
           <release version="1.1b4" date="April 8 2004">
               <action dev="VG" type="fix">
                   Fixed embedded Collection's getCanonicalName.
  
  
  
  1.17      +3 -3      
xml-xindice/java/src/org/apache/xindice/xml/dom/DocumentImpl.java
  
  Index: DocumentImpl.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xindice/java/src/org/apache/xindice/xml/dom/DocumentImpl.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- DocumentImpl.java 24 Feb 2004 15:32:27 -0000      1.16
  +++ DocumentImpl.java 20 May 2004 01:35:58 -0000      1.17
  @@ -348,7 +348,7 @@
                       }
                   }
                   n = n.getParentNode();
  -                if (n.getNodeType() == DOCUMENT_NODE || n.getNodeType() == 
DOCUMENT_FRAGMENT_NODE) {
  +                if (n == null || n.getNodeType() == DOCUMENT_NODE || 
n.getNodeType() == DOCUMENT_FRAGMENT_NODE) {
                       n = null;
                   }
               }