mkwan 2003/04/03 08:16:23
Modified: java/src/org/apache/xpath/axes FilterExprWalker.java
Log:
Commit patch for bug 12797 from Arun Yadav ([EMAIL PROTECTED]).
Revision Changes Path
1.23 +6 -2 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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- FilterExprWalker.java 30 Jan 2003 18:46:23 -0000 1.22
+++ FilterExprWalker.java 3 Apr 2003 16:16:23 -0000 1.23
@@ -110,7 +110,8 @@
case OpCodes.OP_VARIABLE :
m_expr = compiler.compile(opPos);
m_expr.exprSetParent(this);
- if((OpCodes.OP_FUNCTION == stepType) && (m_expr instanceof
org.apache.xalan.templates.FuncKey))
+ //if((OpCodes.OP_FUNCTION == stepType) && (m_expr instanceof
org.apache.xalan.templates.FuncKey))
+ if(m_expr instanceof org.apache.xpath.operations.Variable)
{
// hack/temp workaround
m_canDetachNodeset = false;
@@ -144,7 +145,10 @@
public void detach()
{
super.detach();
- m_exprObj.detach();
+ if (m_canDetachNodeset)
+ {
+ m_exprObj.detach();
+ }
m_exprObj = null;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
