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 Uses Boolean to allow define behaviour per result

Browse Source
This commit is contained in:
Lukasz Lenart
2017-04-28 13:00:09 +02:00
parent 6dad53c5e3
commit 3034b3a970
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java
+9 -4
View File
@@ -60,7 +60,7 @@ public class FreemarkerResult extends StrutsResultSupport {
protected ObjectWrapper wrapper;
protected FreemarkerManager freemarkerManager;
private Writer writer;
private boolean useBufferedWriter = false;
private Boolean useBufferedWriter = null;
/*
* Struts results are constructed for each result execution
@@ -144,7 +144,12 @@ public class FreemarkerResult extends StrutsResultSupport {
// Give subclasses a chance to hook into preprocessing
if (preTemplateProcess(template, model)) {
try {
final boolean willUseBufferedWriter = isUseBufferedWriter() || template.getTemplateExceptionHandler() == TemplateExceptionHandler.RETHROW_HANDLER;
final boolean willUseBufferedWriter;
if (useBufferedWriter != null) {
willUseBufferedWriter = isUseBufferedWriter();
} else {
willUseBufferedWriter = template.getTemplateExceptionHandler() == TemplateExceptionHandler.RETHROW_HANDLER;
}
// Process the template
Writer writer = getWriter();
@@ -352,13 +357,13 @@ public class FreemarkerResult extends StrutsResultSupport {
}
public boolean isUseBufferedWriter() {
return useBufferedWriter;
return useBufferedWriter != null && useBufferedWriter;
}
/**
* @param useBufferedWriter template is processed and flushed according to freemarker library policies
*/
public void setUseBufferedWriter(boolean useBufferedWriter) {
public void setUseBufferedWriter(Boolean useBufferedWriter) {
this.useBufferedWriter = useBufferedWriter;
}
}