sboag 01/06/22 07:51:31
Modified: java/src/org/apache/xpath/axes Tag: Bxalan-j_2_2L
FilterExprWalker.java
Log:
Use asIterator instead of execute/setRoot,
as it is safer. Part of Norm Walsh
variable problem fix.
Revision Changes Path
No revision
No revision
1.16.2.1 +3 -7 xml-xalan/java/src/org/apache/xpath/axes/FilterExprWalker.java
Index: FilterExprWalker.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/axes/FilterExprWalker.java,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -u -r1.16 -r1.16.2.1
--- FilterExprWalker.java 2001/06/15 17:54:22 1.16
+++ FilterExprWalker.java 2001/06/22 14:51:30 1.16.2.1
@@ -144,7 +144,6 @@
// so we have to set up the variable context, execute the expression,
// and then restore the variable context.
- XObject obj;
if(m_lpi.getIsTopLevel())
{
// System.out.println("calling m_expr.execute(m_lpi.getXPathContext())");
@@ -154,17 +153,14 @@
int savedStart = vars.getStackFrame();
vars.setStackFrame(m_lpi.m_stackFrame);
- obj = m_expr.execute(m_lpi.getXPathContext());
+ m_nodeSet = m_expr.asIterator(xctxt, root);
// These two statements need to be combined into one operation.
vars.setStackFrame(savedStart);
}
else
- obj = m_expr.execute(m_lpi.getXPathContext());
-
- // System.out.println("Back from m_expr.execute(m_lpi.getXPathContext()):
"+obj);
- m_nodeSet = (null != obj) ? obj.iter() : null;
-
+ m_nodeSet = m_expr.asIterator(xctxt, root);
+
m_peek = DTM.NULL;
}
catch (javax.xml.transform.TransformerException se)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
