morten      01/09/26 05:19:43

  Modified:    java/src/org/apache/xalan/xsltc/compiler Step.java
               java/src/org/apache/xalan/xsltc/dom NthIterator.java
  Log:
  Removed a bug in the NthIterator iterator that prevented the iterator from
  properly being reset. This bug manifested itself if the Nth iterator was
  wrapped inside a step iterator.
  PR:           bugzilla 3419
  Obtained from:        n/a
  Submitted by: [EMAIL PROTECTED]
  Reviewed by:  [EMAIL PROTECTED]
  
  Revision  Changes    Path
  1.13      +1 -2      xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Step.java
  
  Index: Step.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Step.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- Step.java 2001/09/25 15:57:22     1.12
  +++ Step.java 2001/09/26 12:19:43     1.13
  @@ -1,5 +1,5 @@
   /*
  - * @(#)$Id: Step.java,v 1.12 2001/09/25 15:57:22 morten Exp $
  + * @(#)$Id: Step.java,v 1.13 2001/09/26 12:19:43 morten Exp $
    *
    * The Apache Software License, Version 1.1
    *
  @@ -416,7 +416,6 @@
            else if (predicate.isNthPositionFilter()) {
                if ((_axis == 4) || (_axis == 5)) {
                    il.append(methodGen.loadDOM());
  -                 System.err.println("node type is "+_nodeType);
                    il.append(new PUSH(cpg, _nodeType));
                    predicate.translate(classGen, methodGen);
                    int iter = cpg.addInterfaceMethodref(DOM_INTF,
  
  
  
  1.6       +2 -1      xml-xalan/java/src/org/apache/xalan/xsltc/dom/NthIterator.java
  
  Index: NthIterator.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/NthIterator.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- NthIterator.java  2001/09/24 15:43:15     1.5
  +++ NthIterator.java  2001/09/26 12:19:43     1.6
  @@ -1,5 +1,5 @@
   /*
  - * @(#)$Id: NthIterator.java,v 1.5 2001/09/24 15:43:15 morten Exp $
  + * @(#)$Id: NthIterator.java,v 1.6 2001/09/26 12:19:43 morten Exp $
    *
    * The Apache Software License, Version 1.1
    *
  @@ -99,6 +99,7 @@
        
       public NodeIterator reset() {
        _source.reset();
  +     _ready = true;
        return this;
       }
       
  
  
  

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

Reply via email to