Author: lukaszlenart
Date: Fri Nov 30 17:58:41 2012
New Revision: 1415770
URL: http://svn.apache.org/viewvc?rev=1415770&view=rev
Log:
WW-3928 Rollbacks changes introduced with WW-2749 to allow work with mod_jk and
so on
Modified:
struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesRequestContext.java
Modified:
struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesRequestContext.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesRequestContext.java?rev=1415770&r1=1415769&r2=1415770&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesRequestContext.java
(original)
+++
struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesRequestContext.java
Fri Nov 30 17:58:41 2012
@@ -77,7 +77,7 @@ public class StrutsTilesRequestContext e
}
public void dispatch(String include) throws IOException {
- if (include.endsWith(mask) || include.endsWith(".jsp")) {
+ if (include.endsWith(mask)) {
// FIXME This way FreeMarker results still don't have a
content-type!
include(include);
} else {
