JspReader.singleFile is always true. The nested files it supports have

markt-asf · markt-asf · commit ac225098f53b · 2014-10-27T22:03:22.000Z
not been used since Tomcat 3.x. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1634697 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/java/org/apache/jasper/compiler/JspReader.java b/java/org/apache/jasper/compiler/JspReader.java
@@ -83,13 +83,6 @@ class JspReader {
      */
     private final ErrorDispatcher err;
 
-    /**
-     * Set to true when using the JspReader on a single file where we read up
-     * to the end and reset to the beginning many times.
-     * (as in ParserController.figureOutJspDocument()).
-     */
-    private boolean singleFile;
-
     /**
      * Constructor.
      *
@@ -127,7 +120,6 @@ public JspReader(JspCompilationContext ctxt,
         this.err = err;
         sourceFiles = new Vector<>();
         currFileId = 0;
-        singleFile = false;
         pushFile(fname, reader);
     }
 
@@ -157,10 +149,6 @@ String getFile(final int fileid) {
      */
     boolean hasMoreInput() throws JasperException {
         if (current.cursor >= current.stream.length) {
-            if (singleFile) return false;
-            while (popFile()) {
-                if (current.cursor < current.stream.length) return true;
-            }
             return false;
         }
         return true;
@@ -195,7 +183,7 @@ private int nextChar(Mark mark) throws JasperException {
 
         int ch = current.stream[current.cursor];
 
-        mark.init(current, singleFile);
+        mark.init(current, true);
 
         current.cursor++;
 
@@ -415,15 +403,15 @@ Mark skipUntil(String limit) throws JasperException {
         while((result = indexOf(firstChar, ret)) != null) {
            if (result.booleanValue()) {
                if (restart != null) {
-                   restart.init(current, singleFile);
+                   restart.init(current, true);
                } else {
                    restart = mark();
                }
                for (int i = 1 ; i < limlen ; i++) {
                    if (peekChar() == limit.charAt(i)) {
                        nextChar();
                    } else {
-                       current.init(restart, singleFile);
+                       current.init(restart, true);
                        continue skip;
                    }
                }
@@ -597,10 +585,6 @@ String parseToken(boolean quoted) throws JasperException {
         return StringBuilder.toString();
     }
 
-    void setSingleFile(boolean val) {
-        singleFile = val;
-    }
-
 
     /**
      * Parse utils - Is current character a token delimiter ?
diff --git a/java/org/apache/jasper/compiler/Parser.java b/java/org/apache/jasper/compiler/Parser.java
@@ -1786,7 +1786,6 @@ private String getAttributeBodyType(Node n, String name) {
     }
 
     private void parseFileDirectives(Node parent) throws JasperException {
-        reader.setSingleFile(true);
         reader.skipUntil("<");
         while (reader.hasMoreInput()) {
             start = reader.mark();
diff --git a/java/org/apache/jasper/compiler/ParserController.java b/java/org/apache/jasper/compiler/ParserController.java
@@ -356,7 +356,6 @@ private void determineSyntaxAndEncoding(String absFileName, Jar jar,
         } catch (FileNotFoundException ex) {
             throw new JasperException(ex);
         }
-        jspReader.setSingleFile(true);
         Mark startMark = jspReader.mark();
         if (!isExternal) {
             jspReader.reset(startMark);

Original file line number	Diff line number	Diff line change
`@@ -1786,7 +1786,6 @@ private String getAttributeBodyType(Node n, String name) {`
`1786`	`1786`	`}`
`1787`	`1787`
`1788`	`1788`	`private void parseFileDirectives(Node parent) throws JasperException {`
`1789`		`- reader.setSingleFile(true);`
`1790`	`1789`	`reader.skipUntil("<");`
`1791`	`1790`	`while (reader.hasMoreInput()) {`
`1792`	`1791`	`start = reader.mark();`
Original file line number	Diff line number	Diff line change
`@@ -356,7 +356,6 @@ private void determineSyntaxAndEncoding(String absFileName, Jar jar,`
`356`	`356`	`} catch (FileNotFoundException ex) {`
`357`	`357`	`throw new JasperException(ex);`
`358`	`358`	`}`
`359`		`- jspReader.setSingleFile(true);`
`360`	`359`	`Mark startMark = jspReader.mark();`
`361`	`360`	`if (!isExternal) {`
`362`	`361`	`jspReader.reset(startMark);`