Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-11 01:27:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

WW-4749 Drops writeIfCompleted and uses Boolean instead String

Browse Source
This commit is contained in:
Lukasz Lenart
2017-04-28 09:32:47 +02:00
parent f5125bcd1b
commit 1df89792f9
1 changed files with 4 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java
+4 -24
View File
@@ -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;
}
}