Author: markt
Date: Fri Feb 3 14:48:53 2017
New Revision: 1781562
URL: http://svn.apache.org/viewvc?rev=1781562&view=rev
Log:
Revert r1781539
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Generator.java?rev=1781562&r1=1781561&r2=1781562&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/Generator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Generator.java Fri Feb 3
14:48:53 2017
@@ -1075,9 +1075,13 @@ class Generator {
@Override
public void visit(Node.IncludeAction n) throws JasperException {
- Boolean flush = Boolean.valueOf(n.getTextAttribute("flush"));
+ String flush = n.getTextAttribute("flush");
Node.JspAttribute page = n.getPage();
+ boolean isFlush = false; // default to false;
+ if ("true".equals(flush))
+ isFlush = true;
+
n.setBeginJavaLine(out.getJavaLine());
String pageParam;
@@ -1103,7 +1107,7 @@ class Generator {
out.printin("org.apache.jasper.runtime.JspRuntimeLibrary.include(request,
response, "
+ pageParam);
printParams(n, pageParam, page.isLiteral());
- out.println(", out, " + flush + ");");
+ out.println(", out, " + isFlush + ");");
n.setEndJavaLine(out.getJavaLine());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
