sboag 01/06/17 14:41:41
Modified: java/src/org/apache/xpath/axes PredicatedNodeTest.java
Log:
Tweak executePredicates to make sure that it never returns without
setting m_predicateIndex to -1 again. This should fix the bug for
document2html.xsl for jakarta-avalon.
Revision Changes Path
1.5 +3 -5
xml-xalan/java/src/org/apache/xpath/axes/PredicatedNodeTest.java
Index: PredicatedNodeTest.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/axes/PredicatedNodeTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PredicatedNodeTest.java 2001/06/12 19:16:21 1.4
+++ PredicatedNodeTest.java 2001/06/17 21:41:41 1.5
@@ -262,9 +262,7 @@
boolean executePredicates(int context, XPathContext xctxt)
throws javax.xml.transform.TransformerException
{
-
- m_predicateIndex = 0;
-
+
int nPredicates = getPredicateCount();
// System.out.println("nPredicates: "+nPredicates);
if (nPredicates == 0)
@@ -274,6 +272,7 @@
try
{
+ m_predicateIndex = 0;
xctxt.pushSubContextList(this);
xctxt.pushNamespaceContext(m_lpi.getPrefixResolver());
xctxt.pushCurrentNode(context);
@@ -325,9 +324,8 @@
xctxt.popCurrentNode();
xctxt.popNamespaceContext();
xctxt.popSubContextList();
+ m_predicateIndex = -1;
}
-
- m_predicateIndex = -1;
return true;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
