You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mu...@apache.org on 2010/01/21 07:06:04 UTC
svn commit: r901543 -
/myfaces/trinidad/branches/trinidad-1.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/TrinidadFilterImpl.java
Author: muthaman
Date: Thu Jan 21 06:06:00 2010
New Revision: 901543
URL: http://svn.apache.org/viewvc?rev=901543&view=rev
Log:
TRINIDAD-1572 - Potential Character Encoding problem in the Branch Trinidad-1.0.x
Modified:
myfaces/trinidad/branches/trinidad-1.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/TrinidadFilterImpl.java
Modified: myfaces/trinidad/branches/trinidad-1.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/TrinidadFilterImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/TrinidadFilterImpl.java?rev=901543&r1=901542&r2=901543&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-1.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/TrinidadFilterImpl.java (original)
+++ myfaces/trinidad/branches/trinidad-1.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/TrinidadFilterImpl.java Thu Jan 21 06:06:00 2010
@@ -112,17 +112,7 @@
ServletResponse response,
FilterChain chain) throws IOException, ServletException
{
- String noJavaScript = request.getParameter(XhtmlConstants.NON_JS_BROWSER);
-
- //Wrap the request only for Non-javaScript browsers
- if(noJavaScript != null &&
- XhtmlConstants.NON_JS_BROWSER_TRUE.equals(noJavaScript))
- {
- request = new BasicHTMLBrowserRequestWrapper((HttpServletRequest)request);
- }
-
-
- //Execute the filter services
+ //Execute the filter services
if (!_filters.isEmpty())
chain = new FilterListChain(_filters, chain);
@@ -134,6 +124,15 @@
GlobalConfiguratorImpl config = GlobalConfiguratorImpl.getInstance();
config.beginRequest(externalContext);
+ String noJavaScript = request.getParameter(XhtmlConstants.NON_JS_BROWSER);
+
+ //Wrap the request only for Non-javaScript browsers
+ if(noJavaScript != null &&
+ XhtmlConstants.NON_JS_BROWSER_TRUE.equals(noJavaScript))
+ {
+ request = new BasicHTMLBrowserRequestWrapper((HttpServletRequest)request);
+ }
+
//To maintain backward compatibilty, wrap the request at the filter level
Map<String, String[]> addedParams = FileUploadConfiguratorImpl.getAddedParameters(externalContext);