Author: markt
Date: Mon Oct 27 22:56:25 2014
New Revision: 1634724
URL: http://svn.apache.org/r1634724
Log:
Remove unused Mark.baseDir
This in turn allowed JspReader.master to be removed which was already
marked as suspect.
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/JspReader.java
tomcat/trunk/java/org/apache/jasper/compiler/Mark.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=1634724&r1=1634723&r2=1634724&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:56:25 2014
@@ -57,11 +57,6 @@ class JspReader {
private Mark current;
/**
- * What is this?
- */
- private String master;
-
- /**
* The compilation context.
*/
private final JspCompilationContext context;
@@ -113,7 +108,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(), fname, master);
+ current = new Mark(this, caw.toCharArray(), fname);
} catch (Throwable ex) {
ExceptionUtils.handleThrowable(ex);
log.error("Exception parsing file ", ex);
Modified: tomcat/trunk/java/org/apache/jasper/compiler/Mark.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Mark.java?rev=1634724&r1=1634723&r2=1634724&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/Mark.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Mark.java Mon Oct 27 22:56:25
2014
@@ -31,9 +31,6 @@ final class Mark {
// position within current stream
int cursor, line, col;
- // directory of file for current stream
- String baseDir;
-
// current stream
char[] stream = null;
@@ -48,18 +45,14 @@ final class Mark {
* @param reader JspReader this mark belongs to
* @param inStream current stream for this mark
* @param name JSP file name
- * @param inBaseDir base directory of requested jsp file
*/
- Mark(JspReader reader, char[] inStream, String name,
- String inBaseDir) {
-
+ Mark(JspReader reader, char[] inStream, String name) {
this.ctxt = reader.getJspCompilationContext();
this.stream = inStream;
this.cursor = 0;
this.line = 1;
this.col = 1;
this.fileName = name;
- this.baseDir = inBaseDir;
}
@@ -85,7 +78,6 @@ final class Mark {
this.ctxt = other.ctxt;
this.stream = other.stream;
this.fileName = other.fileName;
- this.baseDir = other.baseDir;
}
}
@@ -94,14 +86,12 @@ final class Mark {
* Constructor
*/
Mark(JspCompilationContext ctxt, String filename, int line, int col) {
-
this.ctxt = ctxt;
this.stream = null;
this.cursor = 0;
this.line = line;
this.col = col;
this.fileName = filename;
- this.baseDir = "le-basedir";
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
