You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2017/05/10 14:39:59 UTC
[09/10] struts git commit: WW-4749 Renames local variable to better
express its meaning
WW-4749 Renames local variable to better express its meaning
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/b842a4c7
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/b842a4c7
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/b842a4c7
Branch: refs/heads/master
Commit: b842a4c779e45e1193e6319970c2dc6f52ec6bf1
Parents: 38a2ebb
Author: Lukasz Lenart <lu...@apache.org>
Authored: Wed May 10 10:08:48 2017 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Wed May 10 10:08:48 2017 +0200
----------------------------------------------------------------------
.../apache/struts2/views/freemarker/FreemarkerResult.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/b842a4c7/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java
index da631d9..c9130ac 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java
@@ -144,16 +144,16 @@ public class FreemarkerResult extends StrutsResultSupport {
// Give subclasses a chance to hook into preprocessing
if (preTemplateProcess(template, model)) {
try {
- final boolean willUseBufferedWriter;
+ final boolean willWriteIfCompleted;
if (writeIfCompleted != null) {
- willUseBufferedWriter = isWriteIfCompleted();
+ willWriteIfCompleted = isWriteIfCompleted();
} else {
- willUseBufferedWriter = template.getTemplateExceptionHandler() == TemplateExceptionHandler.RETHROW_HANDLER;
+ willWriteIfCompleted = template.getTemplateExceptionHandler() == TemplateExceptionHandler.RETHROW_HANDLER;
}
// Process the template
Writer writer = getWriter();
- if (willUseBufferedWriter){
+ if (willWriteIfCompleted){
CharArrayWriter parentCharArrayWriter = (CharArrayWriter) req.getAttribute(PARENT_TEMPLATE_WRITER);
boolean isTopTemplate;
if (isTopTemplate = (parentCharArrayWriter == null)) {