Author: ivassile
Date: 2012-12-26 12:36:16 -0500 (Wed, 26 Dec 2012)
New Revision: 23225
Modified:
branches/enterprise/3.3.1.SP3_BZ-890358/framework/impl/src/main/java/org/ajax4jsf/webapp/WebXml.java
Log:
One-off patch for BZ-890358
Modified:
branches/enterprise/3.3.1.SP3_BZ-890358/framework/impl/src/main/java/org/ajax4jsf/webapp/WebXml.java
===================================================================
---
branches/enterprise/3.3.1.SP3_BZ-890358/framework/impl/src/main/java/org/ajax4jsf/webapp/WebXml.java 2012-12-26
17:25:35 UTC (rev 23224)
+++
branches/enterprise/3.3.1.SP3_BZ-890358/framework/impl/src/main/java/org/ajax4jsf/webapp/WebXml.java 2012-12-26
17:36:16 UTC (rev 23225)
@@ -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;
}
/**