[myfaces] branch main updated: MYFACES-4527: Check for existing writer before creating one

[vo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

volosied pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/myfaces.git


The following commit(s) were added to refs/heads/main by this push:
     new dafff9b4a MYFACES-4527: Check for existing writer before creating one
     new 468a2f7ed Merge pull request #418 from volosied/MYFACES-4527
dafff9b4a is described below

commit dafff9b4aa89a5e61eeb503d93f91ecc84d19bd1
Author: Volodymyr Siedlecki <vo...@gmail.com>
AuthorDate: Fri Dec 9 14:57:50 2022 -0500

    MYFACES-4527: Check for existing writer before creating one
---
 .../myfaces/view/facelets/FaceletViewDeclarationLanguage.java       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java b/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java
index ed0a98dac..791a5927b 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java
@@ -1744,7 +1744,11 @@ public class FaceletViewDeclarationLanguage extends FaceletViewDeclarationLangua
             //}
 
             // setup writer and assign it to the context
-            ResponseWriter origWriter = createResponseWriter(context);
+            ResponseWriter origWriter = context.getResponseWriter();
+            if(origWriter == null)
+            {
+                origWriter = createResponseWriter(context);
+            }
 
             ExternalContext extContext = context.getExternalContext();
             Writer outputWriter = extContext.getResponseOutputWriter();