cvs commit: xml-xalan/java/src/org/apache/xpath/axes UnionPathIterator.java

[sboag]

sboag       00/12/18 12:59:51

  Modified:    java/src/org/apache/xpath/axes UnionPathIterator.java
  Log:
  Call nextNode in the reset of the contained iterators, so that getCurrentNode
  will return something in UnionPathIterator#nextNode.  This was the
  cause of the problems that looked like an xsl:key problem
   that Davanum reported.
  
  Revision  Changes    Path
  1.13      +3 -0      
xml-xalan/java/src/org/apache/xpath/axes/UnionPathIterator.java
  
  Index: UnionPathIterator.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/java/src/org/apache/xpath/axes/UnionPathIterator.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- UnionPathIterator.java    2000/12/17 17:40:01     1.12
  +++ UnionPathIterator.java    2000/12/18 20:59:51     1.13
  @@ -426,12 +426,15 @@
       // super.reset();
       m_foundLast = false;
       m_next = 0;
  +    m_last = 0;
  +    m_lastFetched = null;
   
       int n = m_iterators.length;
   
       for (int i = 0; i < n; i++)
       {
         m_iterators[i].reset();
  +      m_iterators[i].nextNode();
       }
     }