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:54 UTC
[04/10] struts git commit: WW-4749 Drops writeIfCompleted and uses
Boolean instead String
WW-4749 Drops writeIfCompleted and uses Boolean instead String
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/1df89792
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/1df89792
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/1df89792
Branch: refs/heads/master
Commit: 1df89792f93fa71f374eef8a2b1a72b43cc28eab
Parents: f5125bc
Author: Lukasz Lenart <lu...@apache.org>
Authored: Fri Apr 28 09:32:47 2017 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Fri Apr 28 09:32:47 2017 +0200
----------------------------------------------------------------------
.../views/freemarker/FreemarkerResult.java | 28 +++-----------------
1 file changed, 4 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/1df89792/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 7ea7fe3..4ff393d 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
@@ -60,8 +60,7 @@ public class FreemarkerResult extends StrutsResultSupport {
protected ObjectWrapper wrapper;
protected FreemarkerManager freemarkerManager;
private Writer writer;
- private boolean writeIfCompleted = false;
- private String useBufferedWriter;
+ private Boolean useBufferedWriter = null;
/*
* Struts results are constructed for each result execution
@@ -145,12 +144,7 @@ public class FreemarkerResult extends StrutsResultSupport {
// Give subclasses a chance to hook into preprocessing
if (preTemplateProcess(template, model)) {
try {
- final boolean willUseBufferedWriter;
- if (useBufferedWriter != null) {
- willUseBufferedWriter = isUseBufferedWriter();
- } else {
- willUseBufferedWriter = isWriteIfCompleted() || template.getTemplateExceptionHandler() == TemplateExceptionHandler.RETHROW_HANDLER;
- }
+ final boolean willUseBufferedWriter = isUseBufferedWriter() || template.getTemplateExceptionHandler() == TemplateExceptionHandler.RETHROW_HANDLER;
// Process the template
Writer writer = getWriter();
@@ -357,28 +351,14 @@ public class FreemarkerResult extends StrutsResultSupport {
return (Boolean) ObjectUtils.defaultIfNull(attribute, Boolean.FALSE);
}
- /**
- * @return true write to the stream only when template processing completed successfully (false by default)
- */
- public boolean isWriteIfCompleted() {
- return writeIfCompleted;
- }
-
- /**
- * @param writeIfCompleted Writes to the stream only when template processing completed successfully
- */
- public void setWriteIfCompleted(boolean writeIfCompleted) {
- this.writeIfCompleted = writeIfCompleted;
- }
-
public boolean isUseBufferedWriter() {
- return useBufferedWriter != null && Boolean.parseBoolean(useBufferedWriter);
+ return useBufferedWriter != null && useBufferedWriter;
}
/**
* @param useBufferedWriter template is processed and flushed according to freemarker library policies
*/
- public void setUseBufferedWriter(String useBufferedWriter) {
+ public void setUseBufferedWriter(Boolean useBufferedWriter) {
this.useBufferedWriter = useBufferedWriter;
}
}