cvs commit: xml-xalan/java/src/org/apache/xml/dtm/ref DTMDefaultBaseIterators.java

[jkesselm]

jkesselm    01/12/03 10:08:12

  Modified:    java/src/org/apache/xml/dtm/ref DTMDefaultBaseIterators.java
  Log:
  Bugzilla 5242: Special-case initializing iteration from Document node -- one-liner 
wasn't safe.
  
  Revision  Changes    Path
  1.10      +8 -1      
xml-xalan/java/src/org/apache/xml/dtm/ref/DTMDefaultBaseIterators.java
  
  Index: DTMDefaultBaseIterators.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/DTMDefaultBaseIterators.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- DTMDefaultBaseIterators.java      2001/11/26 22:08:28     1.9
  +++ DTMDefaultBaseIterators.java      2001/12/03 18:08:12     1.10
  @@ -1043,7 +1043,14 @@
             _currentNode = node;
           }
           else
  -          _currentNode = getFirstChild(getParent(node));
  +                             {
  +                                     // Be careful to handle the Document node 
properly
  +                                     _currentNode = getParent(node);
  +                                     if(NULL!=_currentNode)  
  +                                             _currentNode = 
getFirstChild(_currentNode);
  +                                     else
  +                                             _currentNode = node;
  +                             }
   
           return resetPosition();
         }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]