Author: markt Date: Mon Oct 27 22:50:55 2014 New Revision: 1634719 URL: http://svn.apache.org/r1634719 Log: Use the file name directly and remove the now unused getFile() method
Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspReader.java Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspReader.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspReader.java?rev=1634719&r1=1634718&r2=1634719&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/compiler/JspReader.java (original) +++ tomcat/trunk/java/org/apache/jasper/compiler/JspReader.java Mon Oct 27 22:50:55 2014 @@ -136,7 +136,7 @@ class JspReader { for (int i = 0 ; (i = reader.read(buf)) != -1 ;) caw.write(buf, 0, i); caw.close(); - current = new Mark(this, caw.toCharArray(), getFile(fileid), master); + current = new Mark(this, caw.toCharArray(), fname, master); } catch (Throwable ex) { ExceptionUtils.handleThrowable(ex); log.error("Exception parsing file ", ex); @@ -164,16 +164,6 @@ class JspReader { } /** - * Returns the file at the given position in the list. - * - * @param fileid The file position in the list - * @return The file at that position, if found, null otherwise - */ - String getFile(final int fileid) { - return sourceFiles.get(fileid); - } - - /** * Checks if the current file has more input. * * @return True if more reading is possible --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org