svn commit: r1695017 - /ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java

[Deepak Dixit-5]

Author: deepak
Date: Mon Aug 10 10:45:49 2015
New Revision: 1695017

URL: http://svn.apache.org/r1695017
Log:
(OFBIZ-6572) Fixed character encoding issue if multitenant is set to Y, move the setCharacterEncoding and setAttributesFromRequestBody method before the multitenant block in ContextFilter, as multitenant block reading the tenatId form request parameter.

Modified:
    ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java

Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java?rev=1695017&r1=1695016&r2=1695017&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java Mon Aug 10 10:45:49 2015
@@ -251,6 +251,8 @@ public class ContextFilter implements Fi
 
         // check if multi tenant is enabled
         boolean useMultitenant = EntityUtil.isMultiTenantEnabled();
+        setCharacterEncoding(request);
+        setAttributesFromRequestBody(request);
         if (useMultitenant) {
             // get tenant delegator by domain name
             String serverName = httpRequest.getServerName();
@@ -318,9 +320,6 @@ public class ContextFilter implements Fi
             }
         }
 
-        setCharacterEncoding(request);
-        setAttributesFromRequestBody(request);
-
         // we're done checking; continue on
         chain.doFilter(request, httpResponse);
     }