santiagopg 02/05/14 15:12:00
Modified: java/src/org/apache/xalan/xsltc/compiler Step.java
java/src/org/apache/xalan/xsltc/dom NodeIteratorBase.java
Log:
Fix for conf test axes113.
Revision Changes Path
1.33 +2 -1
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.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- Step.java 14 May 2002 19:47:22 -0000 1.32
+++ Step.java 14 May 2002 22:12:00 -0000 1.33
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Step.java,v 1.32 2002/05/14 19:47:22 santiagopg Exp $
+ * @(#)$Id: Step.java,v 1.33 2002/05/14 22:12:00 santiagopg Exp $
*
* The Apache Software License, Version 1.1
*
@@ -269,6 +269,7 @@
if (parent instanceof ApplyTemplates) return true;
if (parent instanceof ForEach) return true;
if (parent instanceof FilterParentPath) return true;
+ if (parent instanceof WithParam) return true;
// No not order node set if descendant of these elements:
if (parent instanceof ValueOf) return false;
1.7 +3 -2
xml-xalan/java/src/org/apache/xalan/xsltc/dom/NodeIteratorBase.java
Index: NodeIteratorBase.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/NodeIteratorBase.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- NodeIteratorBase.java 4 Dec 2001 10:30:07 -0000 1.6
+++ NodeIteratorBase.java 14 May 2002 22:12:00 -0000 1.7
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: NodeIteratorBase.java,v 1.6 2001/12/04 10:30:07 morten Exp $
+ * @(#)$Id: NodeIteratorBase.java,v 1.7 2002/05/14 22:12:00 santiagopg Exp $
*
* The Apache Software License, Version 1.1
*
@@ -83,7 +83,8 @@
public NodeIterator reset() {
final boolean temp = _isRestartable;
_isRestartable = true;
- setStartNode(_startNode);
+ // Must adjust _startNode if self is included
+ setStartNode(_includeSelf ? _startNode + 1 : _startNode);
_isRestartable = temp;
return this;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
