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).

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/branches/STRUTS_2_0_X@557352 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Antonio Petrelli
2007-07-18 18:23:36 +00:00
parent 4f11ad0878
commit df0084419b
@@ -79,7 +79,12 @@ public class StrutsTilesRequestContext extends TilesRequestContextWrapper {
}
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);
}
}
/**