You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2010/01/19 07:43:46 UTC
svn commit: r900670 - in
/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/protocol/http:
WicketFilter.java request/WebRequestCodingStrategy.java
Author: ivaynberg
Date: Tue Jan 19 06:43:46 2010
New Revision: 900670
URL: http://svn.apache.org/viewvc?rev=900670&view=rev
Log:
WICKET-1825
Issue: WICKET-1825
Modified:
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebRequestCodingStrategy.java
Modified: wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java?rev=900670&r1=900669&r2=900670&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java (original)
+++ wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java Tue Jan 19 06:43:46 2010
@@ -1133,8 +1133,7 @@
if (pathInfo.startsWith(WebRequestCodingStrategy.RESOURCES_PATH_PREFIX))
{
-
- final String resourceReferenceKey = pathInfo.substring(WebRequestCodingStrategy.RESOURCES_PATH_PREFIX.length());
+ final String resourceReferenceKey = WicketURLDecoder.PATH_INSTANCE.decode(pathInfo.substring(WebRequestCodingStrategy.RESOURCES_PATH_PREFIX.length()));
Resource resource = null;
WebRequestCycle requestCycle = null;
Modified: wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebRequestCodingStrategy.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebRequestCodingStrategy.java?rev=900670&r1=900669&r2=900670&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebRequestCodingStrategy.java (original)
+++ wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebRequestCodingStrategy.java Tue Jan 19 06:43:46 2010
@@ -45,6 +45,7 @@
import org.apache.wicket.behavior.IBehavior;
import org.apache.wicket.behavior.IBehaviorListener;
import org.apache.wicket.protocol.http.WebRequestCycle;
+import org.apache.wicket.protocol.http.WicketURLDecoder;
import org.apache.wicket.protocol.http.portlet.PortletRequestContext;
import org.apache.wicket.request.IRequestCodingStrategy;
import org.apache.wicket.request.IRequestTargetMountsInfo;
@@ -696,7 +697,8 @@
int ix = RESOURCES_PATH_PREFIX.length();
if (pathInfo.length() > ix)
{
- StringBuffer path = new StringBuffer(pathInfo.substring(ix));
+ StringBuffer path = new StringBuffer(
+ WicketURLDecoder.PATH_INSTANCE.decode(pathInfo.substring(ix)));
int ixSemiColon = path.indexOf(";");
// strip off any jsession id
if (ixSemiColon != -1)