Author: markt
Date: Mon Oct 27 22:21:45 2014
New Revision: 1634707
URL: http://svn.apache.org/r1634707
Log:
current can only be null since this is a constructor and it hasn't been
previously set so simplify the code and remove a branch that will never
execute
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=1634707&r1=1634706&r2=1634707&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:21:45 2014
@@ -144,13 +144,7 @@ class JspReader {
for (int i = 0 ; (i = reader.read(buf)) != -1 ;)
caw.write(buf, 0, i);
caw.close();
- if (current == null) {
- current = new Mark(this, caw.toCharArray(), fileid,
- getFile(fileid), master);
- } else {
- current.pushStream(caw.toCharArray(), fileid, getFile(fileid),
- fname);
- }
+ current = new Mark(this, caw.toCharArray(), fileid,
getFile(fileid), master);
} catch (Throwable ex) {
ExceptionUtils.handleThrowable(ex);
log.error("Exception parsing file ", ex);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
