Anonymous avatar Anonymous committed b51b9e4

WW-443 : making WebWorkVelocityServlet flush the writer in mergeTemplate

git-svn-id: http://svn.opensymphony.com/svn/webwork/trunk@316 573baa09-0c28-0410-bef9-dab3c582ae83

Comments (0)

Files changed (1)

src/java/com/opensymphony/webwork/views/velocity/WebWorkVelocityServlet.java

  * @version $Revision$
  */
 public class WebWorkVelocityServlet extends VelocityServlet {
-    //~ Static fields/initializers /////////////////////////////////////////////
-
     //~ Instance fields ////////////////////////////////////////////////////////
 
     private VelocityManager velocityManager;
         return getTemplate(servletPath, getEncoding());
     }
 
-    private String getEncoding()
-    {
-        // todo look into converting this to using XWork/WebWork2 encoding rules
-        try {
-            return Configuration.getString("webwork.i18n.encoding");
-        } catch (IllegalArgumentException e) {
-            return RuntimeSingleton.getString(RuntimeSingleton.OUTPUT_ENCODING, DEFAULT_OUTPUT_ENCODING);
-        }
-    }
-
     /**
      * This method extends the VelocityServlet's loadConfiguration method by performing the following actions:
      * <ul>
         try {
             Writer writer = pageContext.getOut();
             template.merge(context, writer);
+            writer.flush();
         } finally {
             // perform cleanup
             jspFactory.releasePageContext(pageContext);
             actionContext.put(ServletActionContext.PAGE_CONTEXT, oldPageContext);
         }
     }
+
+    private String getEncoding() {
+        // todo look into converting this to using XWork/WebWork2 encoding rules
+        try {
+            return Configuration.getString("webwork.i18n.encoding");
+        } catch (IllegalArgumentException e) {
+            return RuntimeSingleton.getString(RuntimeSingleton.OUTPUT_ENCODING, DEFAULT_OUTPUT_ENCODING);
+        }
+    }
 }
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.