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

[sboag]

sboag       01/06/24 10:23:31

  Modified:    java/src/org/apache/xml/dtm/ref
                        DTMDefaultBaseTraversers.java
  Log:
  In IndexedDTMAxisTraverser#getNextIndexed, the check for
  axisHasBeenProcessed has to be done after the
  findElementFromIndex, but before the nextNode() call.  This
  fixes several failures in the s2s test.
  
  Revision  Changes    Path
  1.4       +3 -2      
xml-xalan/java/src/org/apache/xml/dtm/ref/DTMDefaultBaseTraversers.java
  
  Index: DTMDefaultBaseTraversers.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/DTMDefaultBaseTraversers.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DTMDefaultBaseTraversers.java     2001/06/21 18:54:48     1.3
  +++ DTMDefaultBaseTraversers.java     2001/06/24 17:23:30     1.4
  @@ -554,7 +554,7 @@
         int nsIndex = m_expandedNameTable.getNamespaceID(extendedTypeID);
         int lnIndex = m_expandedNameTable.getLocalNameID(extendedTypeID);
   
  -      do
  +      while(true)
         {
           int next = findElementFromIndex(nsIndex, lnIndex, nextPotential);
   
  @@ -566,10 +566,11 @@
             // System.out.println("Found node via index: "+first);
             return next;
           }
  +        else if(axisHasBeenProcessed(axisRoot))
  +          break;
   
           nextNode();
         }
  -      while( !axisHasBeenProcessed(axisRoot) );
   
         return DTM.NULL;
       }
  
  
  

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