ecarmich 2003/08/30 20:46:29
Modified: jasper2/src/share/org/apache/jasper/compiler
SmapStratum.java
Log:
Don't combine LineInfos from different files
Revision Changes Path
1.10 +4 -2
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/SmapStratum.java
Index: SmapStratum.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/SmapStratum.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SmapStratum.java 30 Aug 2003 21:51:50 -0000 1.9
+++ SmapStratum.java 31 Aug 2003 03:46:29 -0000 1.10
@@ -216,7 +216,8 @@
while (i < lineData.size() - 1) {
LineInfo li = (LineInfo)lineData.get(i);
LineInfo liNext = (LineInfo)lineData.get(i + 1);
- if (liNext.inputStartLine == li.inputStartLine
+ if (!liNext.lineFileIDSet
+ && liNext.inputStartLine == li.inputStartLine
&& liNext.inputLineCount == 1
&& li.inputLineCount == 1
&& liNext.outputStartLine
@@ -238,7 +239,8 @@
while (i < lineData.size() - 1) {
LineInfo li = (LineInfo)lineData.get(i);
LineInfo liNext = (LineInfo)lineData.get(i + 1);
- if (liNext.inputStartLine == li.inputStartLine + li.inputLineCount
+ if (!liNext.lineFileIDSet
+ && liNext.inputStartLine == li.inputStartLine + li.inputLineCount
&& liNext.outputLineIncrement == li.outputLineIncrement
&& liNext.outputStartLine
== li.outputStartLine
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
