remm 2003/08/10 01:35:39
Modified: jasper2/src/share/org/apache/jasper/compiler
SmapStratum.java
Log:
- Apply workaround for failure in optimizeLineSection() when there are entries
with an outputStartLine of 0. Submitted by Eric Carmichael.
Revision Changes Path
1.7 +8 -0 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SmapStratum.java 9 Aug 2003 19:19:37 -0000 1.6
+++ SmapStratum.java 10 Aug 2003 08:35:39 -0000 1.7
@@ -276,6 +276,14 @@
throw new IllegalArgumentException(
"inputFileName: " + inputFileName);
+ //Jasper incorrectly SMAPs certain Nodes, giving them an
+ //outputStartLine of 0. This can cause a fatal error in
+ //optimizeLineSection, making it impossible for Jasper to
+ //compile the JSP. Until we can fix the underlying
+ //SMAPping problem, we simply ignore the flawed SMAP entries.
+ if (outputStartLine == 0)
+ return;
+
// build the LineInfo
LineInfo li = new LineInfo();
li.setInputStartLine(inputStartLine);
|