You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2007/08/26 04:07:27 UTC
svn commit: r569756 -
/myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletExternalContext.java
Author: matzew
Date: Sat Aug 25 19:07:26 2007
New Revision: 569756
URL: http://svn.apache.org/viewvc?rev=569756&view=rev
Log:
for some reasons, the 122 branch forgot to set char encoding
Modified:
myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletExternalContext.java
Modified: myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletExternalContext.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletExternalContext.java?rev=569756&r1=569755&r2=569756&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletExternalContext.java (original)
+++ myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/external/ServletExternalContext.java Sat Aug 25 19:07:26 2007
@@ -640,6 +640,31 @@
// (this was reported by frederic.auge [frederic.auge@laposte.net])
_requestServletPath = _httpServletRequest.getServletPath();
_requestPathInfo = _httpServletRequest.getPathInfo();
+
+ final String contentType = _httpServletRequest.getHeader("Content-Type");
+
+ String characterEncoding = _lookupCharacterEncoding(contentType);
+
+ if (characterEncoding == null)
+ {
+ final HttpSession session = _httpServletRequest.getSession(false);
+ if (session != null)
+ {
+ characterEncoding = (String) session.getAttribute(ViewHandler.CHARACTER_ENCODING_KEY);
+ }
+
+ if (characterEncoding != null)
+ {
+ try
+ {
+ _servletRequest.setCharacterEncoding(characterEncoding);
+ }
+ catch (UnsupportedEncodingException uee)
+ {
+ _LOG.warning(uee);
+ }
+ }
+ }
}
private Map<String, Object> _applicationMap;