Modified Myriams setting of searchStart a bit, so the nested variables at
inside a variable at the top level work now.
git-svn-id: https://svn.apache.org/repos/asf/xalan/java/trunk@334062 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/org/apache/xalan/templates/ElemApplyTemplates.java b/src/org/apache/xalan/templates/ElemApplyTemplates.java
index 76f095b..9769190 100644
--- a/src/org/apache/xalan/templates/ElemApplyTemplates.java
+++ b/src/org/apache/xalan/templates/ElemApplyTemplates.java
@@ -239,11 +239,12 @@
if (null != m_paramElems)
{
transformer.pushParams(xctxt, this, sourceNode, mode);
- vars.setSearchStart(-1);
- }
+ }
else
vars.pushContextMarker();
+ vars.setSearchStart(-1);
+
return savedSearchStart;
}
diff --git a/src/org/apache/xalan/templates/ElemCallTemplate.java b/src/org/apache/xalan/templates/ElemCallTemplate.java
index c581e56..a31b399 100644
--- a/src/org/apache/xalan/templates/ElemCallTemplate.java
+++ b/src/org/apache/xalan/templates/ElemCallTemplate.java
@@ -170,12 +170,13 @@
XPathContext xctxt = transformer.getXPathContext();
VariableStack vars = xctxt.getVarStack();
+ int savedSearchStart = vars.getSearchStart();
+
if (null != m_paramElems)
transformer.pushParams(xctxt, this, sourceNode, mode);
else
vars.pushContextMarker();
- int savedSearchStart = vars.getSearchStart();
vars.setSearchStart(-1);
SourceLocator savedLocator = xctxt.getSAXLocator();
