mmidy 02/01/31 08:33:25
Modified: java/src/org/apache/xalan/templates ElemApplyTemplates.java
Log:
Bug 5505: Need to resolve params before we do anything else, so move code
that does that above the code that sets up the different node stacks.
Revision Changes Path
1.19 +18 -16
xml-xalan/java/src/org/apache/xalan/templates/ElemApplyTemplates.java
Index: ElemApplyTemplates.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemApplyTemplates.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ElemApplyTemplates.java 26 Nov 2001 22:08:28 -0000 1.18
+++ ElemApplyTemplates.java 31 Jan 2002 16:33:25 -0000 1.19
@@ -277,22 +277,6 @@
final TemplateList tl = sroot.getTemplateListComposed();
final boolean quiet = transformer.getQuietConflictWarnings();
- xctxt.pushCurrentNode(DTM.NULL);
- int[] currentNodes = xctxt.getCurrentNodeStack();
- int currentNodePos = xctxt.getCurrentNodeFirstFree() - 1;
-
- xctxt.pushCurrentExpressionNode(DTM.NULL);
- int[] currentExpressionNodes = xctxt.getCurrentExpressionNodeStack();
- int currentExpressionNodePos =
xctxt.getCurrentExpressionNodesFirstFree() - 1;
-
- xctxt.pushSAXLocatorNull();
- xctxt.pushContextNodeList(sourceNodes);
- transformer.pushElemTemplateElement(null);
- // pushParams(transformer, xctxt);
-
- // Should be able to get this from the iterator but there must be a
bug.
- DTM dtm = xctxt.getDTM(sourceNode);
-
int argsFrame = -1;
if(nParams > 0)
{
@@ -311,6 +295,24 @@
}
vars.setStackFrame(argsFrame);
}
+
+ xctxt.pushCurrentNode(DTM.NULL);
+ int[] currentNodes = xctxt.getCurrentNodeStack();
+ int currentNodePos = xctxt.getCurrentNodeFirstFree() - 1;
+
+ xctxt.pushCurrentExpressionNode(DTM.NULL);
+ int[] currentExpressionNodes = xctxt.getCurrentExpressionNodeStack();
+ int currentExpressionNodePos =
xctxt.getCurrentExpressionNodesFirstFree() - 1;
+
+ xctxt.pushSAXLocatorNull();
+ xctxt.pushContextNodeList(sourceNodes);
+ transformer.pushElemTemplateElement(null);
+ // pushParams(transformer, xctxt);
+
+ // Should be able to get this from the iterator but there must be a
bug.
+ DTM dtm = xctxt.getDTM(sourceNode);
+
+
int child;
while (DTM.NULL != (child = sourceNodes.nextNode()))
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
