morten 01/12/10 07:43:38
Modified: java/src/org/apache/xalan/xsltc/compiler/util
MethodGenerator.java
Log:
Fix for use of XPath expressions in contexts where there is no 'current'
node (ie. in top-level elements such as variables and attribute sets).
PR: bugzilla 5194
Obtained from: n/a
Submitted by: [EMAIL PROTECTED]
Reviewed by: [EMAIL PROTECTED]
Revision Changes Path
1.7 +9 -4
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/MethodGenerator.java
Index: MethodGenerator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/MethodGenerator.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MethodGenerator.java 2001/09/20 14:23:25 1.6
+++ MethodGenerator.java 2001/12/10 15:43:37 1.7
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: MethodGenerator.java,v 1.6 2001/09/20 14:23:25 morten Exp $
+ * @(#)$Id: MethodGenerator.java,v 1.7 2001/12/10 15:43:37 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -255,9 +255,14 @@
}
public Instruction loadCurrentNode() {
- return _iloadCurrent != null
- ? _iloadCurrent
- : (_iloadCurrent = new ILOAD(getLocalIndex("current")));
+ if (_iloadCurrent == null) {
+ int idx = getLocalIndex("current");
+ if (idx > 0)
+ _iloadCurrent = new ILOAD(idx);
+ else
+ _iloadCurrent = new ICONST(0);
+ }
+ return _iloadCurrent;
}
public Instruction storeCurrentNode() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
