Author: ivassile Date: 2013-12-09 21:57:47 -0500 (Mon, 09 Dec 2013) New Revision: 23276 Modified: branches/enterprise/3.3.1.SP4/framework/impl/src/main/java/org/ajax4jsf/webapp/WebXml.java Log: Integrating richfaces/branches/enterprise/3.3.1.SP3_BZ-890358 Modified: branches/enterprise/3.3.1.SP4/framework/impl/src/main/java/org/ajax4jsf/webapp/WebXml.java =================================================================== --- branches/enterprise/3.3.1.SP4/framework/impl/src/main/java/org/ajax4jsf/webapp/WebXml.java 2013-12-10 02:51:21 UTC (rev 23275) +++ branches/enterprise/3.3.1.SP4/framework/impl/src/main/java/org/ajax4jsf/webapp/WebXml.java 2013-12-10 02:57:47 UTC (rev 23276) @@ -22,6 +22,8 @@ package org.ajax4jsf.webapp; import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; import javax.faces.context.FacesContext; import javax.servlet.ServletContext; @@ -219,7 +221,16 @@ String resourcePath = request.getRequestURI().substring( request.getContextPath().length());// isPrefixMapping()?request.getPathInfo():request.getServletPath(); - return getFacesResourceKey(resourcePath); + String s = getFacesResourceKey(resourcePath); + if (null != s) { + try { + return URLDecoder.decode(s, "ISO-8859-1"); + } catch (UnsupportedEncodingException e) { + // Doesn't happen. + } + } + + return null; } /**