tmiller 2002/08/13 12:12:33
Modified: java/src/org/apache/xalan/xsltc/compiler ParameterRef.java
Expression.java VariableRef.java
Log:
bug fix for bugzilla 11221, MK053
Revision Changes Path
1.11 +7 -5
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ParameterRef.java
Index: ParameterRef.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ParameterRef.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ParameterRef.java 1 Feb 2002 20:07:08 -0000 1.10
+++ ParameterRef.java 13 Aug 2002 19:12:32 -0000 1.11
@@ -112,10 +112,12 @@
}
if (_variable.getType() instanceof NodeSetType) {
- final int reset = cpg.addInterfaceMethodref(NODE_ITERATOR,
- "reset",
- "()"+NODE_ITERATOR_SIG);
- il.append(new INVOKEINTERFACE(reset,1));
+ // The method cloneIterator() also does resetting
+ final int clone = cpg.addInterfaceMethodref(NODE_ITERATOR,
+ "cloneIterator",
+ "()" +
+ NODE_ITERATOR_SIG);
+ il.append(new INVOKEINTERFACE(clone, 1));
}
}
1.15 +2 -10
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Expression.java
Index: Expression.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Expression.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Expression.java 29 Jul 2002 21:30:51 -0000 1.14
+++ Expression.java 13 Aug 2002 19:12:32 -0000 1.15
@@ -180,15 +180,7 @@
return; // nothing to do
}
- if (this instanceof VariableRefBase) {
- // The method cloneIterator() also does resetting
- final int clone =
- cpg.addInterfaceMethodref(NODE_ITERATOR,
- "cloneIterator",
- "()" + NODE_ITERATOR_SIG);
- il.append(new INVOKEINTERFACE(clone, 1));
- }
- else {
+ if ( (this instanceof VariableRefBase) == false ) {
il.append(methodGen.loadContextNode());
il.append(methodGen.setStartNode());
}
1.12 +7 -5
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/VariableRef.java
Index: VariableRef.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/VariableRef.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- VariableRef.java 1 Feb 2002 20:07:08 -0000 1.11
+++ VariableRef.java 13 Aug 2002 19:12:32 -0000 1.12
@@ -135,10 +135,12 @@
}
if (_variable.getType() instanceof NodeSetType) {
- final int reset = cpg.addInterfaceMethodref(NODE_ITERATOR,
- "reset",
- "()"+NODE_ITERATOR_SIG);
- il.append(new INVOKEINTERFACE(reset,1));
+ // The method cloneIterator() also does resetting
+ final int clone = cpg.addInterfaceMethodref(NODE_ITERATOR,
+ "cloneIterator",
+ "()" +
+ NODE_ITERATOR_SIG);
+ il.append(new INVOKEINTERFACE(clone, 1));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
