morten 01/11/21 02:52:54
Modified: java/src/org/apache/xalan/xsltc/compiler ApplyTemplates.java
Sort.java
Log:
A fix for a regression introduced by a fix for <xsl:sort/> and nested
<xsl:for-each/> elements.
PR: bugzilla 4921
Obtained from: n/a
Submitted by: [EMAIL PROTECTED]
Reviewed by: [EMAIL PROTECTED]
Revision Changes Path
1.9 +7 -1
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ApplyTemplates.java
Index: ApplyTemplates.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ApplyTemplates.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ApplyTemplates.java 2001/10/30 08:42:55 1.8
+++ ApplyTemplates.java 2001/11/21 10:52:54 1.9
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: ApplyTemplates.java,v 1.8 2001/10/30 08:42:55 morten Exp $
+ * @(#)$Id: ApplyTemplates.java,v 1.9 2001/11/21 10:52:54 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -186,6 +186,12 @@
if (sortObjects.size() > 0) {
Sort.translateSortIterator(classGen, methodGen,
_select, sortObjects);
+ int setStartNode = cpg.addInterfaceMethodref(NODE_ITERATOR,
+ SET_START_NODE,
+ "(I)"+
+ NODE_ITERATOR_SIG);
+ il.append(methodGen.loadCurrentNode());
+ il.append(new INVOKEINTERFACE(setStartNode,2));
}
else {
if (_select == null)
1.12 +1 -6 xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Sort.java
Index: Sort.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Sort.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Sort.java 2001/11/20 13:55:21 1.11
+++ Sort.java 2001/11/21 10:52:54 1.12
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Sort.java,v 1.11 2001/11/20 13:55:21 morten Exp $
+ * @(#)$Id: Sort.java,v 1.12 2001/11/21 10:52:54 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -215,11 +215,6 @@
+ NODE_SORT_FACTORY_SIG
+ ")V");
- final int setStartNode = cpg.addInterfaceMethodref(NODE_ITERATOR,
- SET_START_NODE,
- "(I)"+
- NODE_ITERATOR_SIG);
-
il.append(new NEW(cpg.addClass(SORT_ITERATOR)));
il.append(DUP);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
