You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jc...@apache.org on 2010/04/27 15:51:21 UTC
svn commit: r938456 -
/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java
Author: jcompagner
Date: Tue Apr 27 13:51:21 2010
New Revision: 938456
URL: http://svn.apache.org/viewvc?rev=938456&view=rev
Log:
better fix for WICKET-1825, the encoder wants to have an Application or else it will throw a warning in the log every time (our log is full of it)
Issue: WICKET-1825
Modified:
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.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=938456&r1=938455&r2=938456&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 Apr 27 13:51:21 2010
@@ -1133,8 +1133,6 @@ public class WicketFilter implements Fil
if (pathInfo.startsWith(WebRequestCodingStrategy.RESOURCES_PATH_PREFIX))
{
- final String resourceReferenceKey = WicketURLDecoder.PATH_INSTANCE.decode(pathInfo.substring(WebRequestCodingStrategy.RESOURCES_PATH_PREFIX.length()));
-
Resource resource = null;
WebRequestCycle requestCycle = null;
@@ -1148,6 +1146,9 @@ public class WicketFilter implements Fil
Application.set(webApplication);
}
+ final String resourceReferenceKey = WicketURLDecoder.PATH_INSTANCE.decode(pathInfo.substring(WebRequestCodingStrategy.RESOURCES_PATH_PREFIX.length()));
+
+
// Try to find shared resource
resource = webApplication.getSharedResources().get(resourceReferenceKey);