← Back to branch summary

~ubuntu-branches/ubuntu/natty/tomcat6/natty-proposed

« back to all changes in this revision

Viewing changes to java/org/apache/jasper/compiler/JavacErrorDetail.java

  • Committer: Bazaar Package Importer
  • Author(s): Thierry Carrez
  • Date: 2010-05-21 13:51:15 UTC
  • mfrom: (2.2.12 sid)
  • Revision ID: james.westby@ubuntu.com-20100521135115-qfwnf24lzvi3644v
Tags: 6.0.26-2
http://bugs.debian.org/581018
https://launchpad.net/bugs/557300
https://launchpad.net/bugs/569118
* debian/tomcat6.{postinst,prerm}: Respect TOMCAT6_USER and TOMCAT6_GROUP
  as defined in /etc/default/tomcat6 when setting directory permissions and
  authbind configuration (Closes: #581018, LP: #557300)
* debian/tomcat6.postinst: Use group "tomcat6" instead of "adm" for
  permissions in /var/lib/tomcat6, so that group "adm" doesn't get write
  permissions over /var/lib/tomcat6/webapps (LP: #569118)

Show diffs side-by-side

added added

removed removed

Lines of Context:
java/org/apache/jasper/compiler/JavacErrorDetail.java
105
105
                fis = new FileInputStream(ctxt.getServletJavaFileName());
106
106
                String[] javaLines = readFile(fis);
107
107
    
 
108
                if (jspLines.length < jspBeginLineNum) {
 
109
                    // Avoid ArrayIndexOutOfBoundsException
 
110
                    // Probably bug 48498 but could be some other cause
 
111
                    jspExtract = Localizer.getMessage("jsp.error.bug48498");
 
112
                    return;
 
113
                }
 
114
                
108
115
                // If the line contains the opening of a multi-line scriptlet
109
116
                // block, then the JSP line number we got back is probably
110
117
                // faulty.  Scan forward to match the java line...