Improved #5543; save encoding in session AFTER rendering view as it will

otherwise fail on 1st request when session hasn't been created yet

Author: BalusC

impl/src/main/java/com/sun/faces/application/view/FaceletViewHandlingStrategy.java

@@ -454,6 +454,11 @@ public void renderView(FacesContext ctx, UIViewRoot viewToRender) throws IOExcep
                 writer.endDocument();
             }
 
+            // Save encoding in Session for consult in subsequent postback request as per spec section "2.5.2.2. Determining the Character Encoding".
+            if (ctx.getExternalContext().getSession(false) != null) {
+                ctx.getExternalContext().getSessionMap().put(CHARACTER_ENCODING_KEY, writer.getCharacterEncoding());
+            }
+
             // Finish writing
             writer.close();
 
@@ -929,11 +934,6 @@ protected ResponseWriter createResponseWriter(FacesContext context) throws IOExc
         // Save encoding in UIViewRoot for faster consult when Util#getResponseEncoding() is invoked again elsewhere.
         context.getViewRoot().getAttributes().put(FACELETS_ENCODING_KEY, encoding);
 
-        // Save encoding in Session for consult in subsequent postback request as per spec section "2.5.2.2. Determining the Character Encoding".
-        if (context.getExternalContext().getSession(false) != null) {
-            context.getExternalContext().getSessionMap().put(CHARACTER_ENCODING_KEY, encoding);
-        }
-
         // Now, clone with the real writer
         ResponseWriter writer = initWriter.cloneWithWriter(extContext.getResponseOutputWriter());
 

impl/src/main/java/com/sun/faces/util/Util.java

@@ -1667,7 +1667,7 @@ public static String getResponseEncoding(FacesContext context, String defaultEnc
 
         if (encoding == null && context.getExternalContext().getSession(false) != null) {
             // 4. If still none found then get previously known request or response encoding from session.
-            //    See also ViewHandler#initView() and FaceletViewHandlingStrategy#createResponseWriter().
+            //    See also ViewHandler#initView() and FaceletViewHandlingStrategy#renderView().
             encoding = (String) context.getExternalContext().getSessionMap().get(CHARACTER_ENCODING_KEY);
 
             if (encoding != null && LOGGER.isLoggable(FINEST)) {