Author: musachy Date: Mon Oct 27 07:37:53 2008 New Revision: 708200 URL: http://svn.apache.org/viewvc?rev=708200&view=rev Log: Fix merge from trunk. WW-2849
Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java?rev=708200&r1=708199&r2=708200&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java (original) +++ struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java Mon Oct 27 07:37:53 2008 @@ -408,8 +408,7 @@ } if (serveStatic && resourcePath.startsWith("/struts")) { - String name = resourcePath.substring("/struts".length()); - findStaticResource(name, request, response); + findStaticResource(resourcePath, request, response); } else { // this is a normal request, let it pass through chain.doFilter(request, response);