Author: markt
Date: Tue Feb 16 00:46:07 2010
New Revision: 910370
URL: http://svn.apache.org/viewvc?rev=910370&view=rev
Log:
Workaround Java 6/7 bug described in
https://issues.apache.org/bugzilla/show_bug.cgi?id=48498
Avoid the ArrayIndexOutOfBoundsException
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/JavacErrorDetail.java
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/jasper/compiler/JavacErrorDetail.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JavacErrorDetail.java?rev=910370&r1=910369&r2=910370&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/JavacErrorDetail.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JavacErrorDetail.java Tue Feb
16 00:46:07 2010
@@ -96,6 +96,13 @@
fis = new FileInputStream(ctxt.getServletJavaFileName());
String[] javaLines = readFile(fis);
+ if (jspLines.length < jspBeginLineNum) {
+ // Avoid ArrayIndexOutOfBoundsException
+ // Probably bug 48494 but could be some other cause
+ jspExtract = Localizer.getMessage("jsp.error.bug48494");
+ return;
+ }
+
// If the line contains the opening of a multi-line scriptlet
// block, then the JSP line number we got back is probably
// faulty. Scan forward to match the java line...
Modified: tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties?rev=910370&r1=910369&r2=910370&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties Tue
Feb 16 00:46:07 2010
@@ -456,3 +456,6 @@
# JarScanner
jsp.warning.noJarScanner=Warning: No org.apache.tomcat.JarScanner set in
ServletContext. Falling back to default JarScanner implementation.
+
+# JavacErrorDetail
+jsp.error.bug48494=Unable to display JSP extract. Probably due to a JRE bug
(see Tomcat bug 48498 for details).
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
