You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by em...@apache.org on 2017/08/22 18:48:26 UTC

svn commit: r1805805 - /myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImpl.java

Author: embreijo
Date: Tue Aug 22 18:48:26 2017
New Revision: 1805805

URL: http://svn.apache.org/viewvc?rev=1805805&view=rev
Log:
MYFACES-4125 Response committed too early due to flush from StateWriter

Modified:
    myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImpl.java

Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImpl.java?rev=1805805&r1=1805804&r2=1805805&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImpl.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImpl.java Tue Aug 22 18:48:26 2017
@@ -34,6 +34,7 @@ import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
 import javax.faces.render.Renderer;
 
+import org.apache.myfaces.shared.config.MyfacesConfig;
 import org.apache.myfaces.shared.renderkit.ContentTypeUtils;
 import org.apache.myfaces.shared.renderkit.RendererUtils;
 import org.apache.myfaces.shared.renderkit.html.util.UnicodeEncoder;
@@ -303,7 +304,12 @@ public class HtmlResponseWriterImpl
 
     public void endDocument() throws IOException
     {
-        _currentWriter.flush();
+        MyfacesConfig myfacesConfig = MyfacesConfig.getCurrentInstance(
+            FacesContext.getCurrentInstance().getExternalContext());
+        if (myfacesConfig.isEarlyFlushEnabled())
+        {
+            _currentWriter.flush();
+        }
         _facesContext = null;
     }