From c0d4fe51fbf63f1deec3417aa0a2449e11cbaafc Mon Sep 17 00:00:00 2001 From: Antonio Petrelli Date: Fri, 23 Feb 2007 14:36:25 +0000 Subject: [PATCH] Updated to follow the changes in Tiles API. See TILES-114. git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@510959 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/struts2/tiles/StrutsTilesContainerFactory.java | 4 ++-- .../main/java/org/apache/struts2/views/tiles/TilesResult.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java index 3bbe4fc4d..6a82968e3 100644 --- a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java +++ b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java @@ -98,8 +98,8 @@ public class StrutsTilesContainerFactory extends TilesContainerFactory { return factory.createApplicationContext(context); } - public TilesRequestContext createRequestContext(TilesApplicationContext tilesApplicationContext, Object request, Object response) { - TilesRequestContext context = factory.createRequestContext(tilesApplicationContext, request, response); + public TilesRequestContext createRequestContext(TilesApplicationContext tilesApplicationContext, Object... requestItems) { + TilesRequestContext context = factory.createRequestContext(tilesApplicationContext, requestItems); return new StrutsTilesRequestContext(context); } diff --git a/plugins/tiles/src/main/java/org/apache/struts2/views/tiles/TilesResult.java b/plugins/tiles/src/main/java/org/apache/struts2/views/tiles/TilesResult.java index 57dff6018..b3503f08a 100644 --- a/plugins/tiles/src/main/java/org/apache/struts2/views/tiles/TilesResult.java +++ b/plugins/tiles/src/main/java/org/apache/struts2/views/tiles/TilesResult.java @@ -101,6 +101,6 @@ public class TilesResult extends ServletDispatcherResult { HttpServletRequest request = ServletActionContext.getRequest(); HttpServletResponse response = ServletActionContext.getResponse(); - container.render(request, response, location); + container.render(location, request, response); } }