Author: apetrelli
Date: Wed Jul 18 11:23:36 2007
New Revision: 557352
URL: http://svn.apache.org/viewvc?view=rev&rev=557352
Log:
WW-1724
Merged from trunk to 2_0_X branch.
The request context for Struts 2 - Tiles 2 integration tries to dispatch the
request if possible.
It includes it only if the response has been committed, or if it is a
FreeMarker request (this must be fixed).
Modified:
struts/struts2/branches/STRUTS_2_0_X/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesRequestContext.java
Modified:
struts/struts2/branches/STRUTS_2_0_X/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesRequestContext.java
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesRequestContext.java?view=diff&rev=557352&r1=557351&r2=557352
==============================================================================
---
struts/struts2/branches/STRUTS_2_0_X/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesRequestContext.java
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesRequestContext.java
Wed Jul 18 11:23:36 2007
@@ -79,7 +79,12 @@
}
public void dispatch(String include) throws IOException {
- include(include);
+ if (include.endsWith(mask)) {
+ // FIXME This way FreeMarker results still don't have a
content-type!
+ include(include);
+ } else {
+ super.dispatch(include);
+ }
}
/**
