You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by il...@apache.org on 2002/07/24 19:06:46 UTC
cvs commit: xml-xalan/java/src/org/apache/xalan/templates ElemForEach.java ElemApplyTemplates.java
ilene 2002/07/24 10:06:46
Modified: java/src/org/apache/xalan/templates ElemForEach.java
ElemApplyTemplates.java
Log:
Check that recursionLimit is not negative before calling checkForInfinateLoop.
Revision Changes Path
1.29 +1 -2 xml-xalan/java/src/org/apache/xalan/templates/ElemForEach.java
Index: ElemForEach.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemForEach.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ElemForEach.java 10 Apr 2002 20:33:58 -0000 1.28
+++ ElemForEach.java 24 Jul 2002 17:06:46 -0000 1.29
@@ -80,7 +80,6 @@
import org.apache.xalan.transformer.TransformerImpl;
import org.apache.xalan.transformer.NodeSorter;
import org.apache.xalan.transformer.ResultTreeHandler;
-import org.apache.xalan.transformer.StackGuard;
import org.apache.xalan.transformer.ClonerToResultTree;
import javax.xml.transform.SourceLocator;
@@ -554,5 +553,5 @@
exp.exprSetParent(this);
m_selectExpression = exp;
}
-
+
}
1.25 +2 -1 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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ElemApplyTemplates.java 8 Jun 2002 20:41:00 -0000 1.24
+++ ElemApplyTemplates.java 24 Jul 2002 17:06:46 -0000 1.25
@@ -364,7 +364,8 @@
}
transformer.pushPairCurrentMatched(template, child);
- transformer.getStackGuard().checkForInfinateLoop();
+ if (check)
+ guard.checkForInfinateLoop();
int currentFrameBottom; // See comment with unlink, below
if(template.m_frameSize > 0)
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org