Defines helper method to fetch ActionContext from request
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/334e6ca4 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/334e6ca4 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/334e6ca4 Branch: refs/heads/master Commit: 334e6ca462ad0cec85de090066ae81e03b199919 Parents: b417894 Author: Lukasz Lenart <lukasz.len...@gmail.com> Authored: Wed Jan 13 12:05:03 2016 +0100 Committer: Lukasz Lenart <lukasz.len...@gmail.com> Committed: Wed Jan 13 12:05:03 2016 +0100 ---------------------------------------------------------------------- .../StrutsFreeMarkerAttributeRenderer.java | 30 +++++++++++++++++--- 1 file changed, 26 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/334e6ca4/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsFreeMarkerAttributeRenderer.java ---------------------------------------------------------------------- diff --git a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsFreeMarkerAttributeRenderer.java b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsFreeMarkerAttributeRenderer.java index 48592e0..fbc5416 100644 --- a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsFreeMarkerAttributeRenderer.java +++ b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsFreeMarkerAttributeRenderer.java @@ -36,7 +36,9 @@ import org.apache.struts2.views.freemarker.StrutsBeanWrapper; import org.apache.tiles.freemarker.template.TilesFMModelRepository; import org.apache.tiles.impl.InvalidTemplateException; import org.apache.tiles.request.Request; +import org.apache.tiles.request.jsp.JspRequest; import org.apache.tiles.request.render.Renderer; +import org.apache.tiles.request.servlet.ServletRequest; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; @@ -51,10 +53,7 @@ public class StrutsFreeMarkerAttributeRenderer implements Renderer { if (path != null) { LOG.trace("Rendering freemarker tile ..."); - ActionContext ctx = ServletActionContext.getActionContext((HttpServletRequest) request); - if (ctx == null) { - throw new ConfigurationException("There is no ActionContext for current request!"); - } + ActionContext ctx = readActionContext(request); registerTilesBeanModel(ctx); @@ -77,6 +76,29 @@ public class StrutsFreeMarkerAttributeRenderer implements Renderer { } } + /** + * Depending how Tiles definition was defined, request can an instance of JspRequest (for JSPs) + * or a ServletRequest (FreeMarker) + */ + protected ActionContext readActionContext(Request request) { + ActionContext ctx = null; + + if (request instanceof ServletRequest) { + HttpServletRequest httpRequest = ((ServletRequest) request).getRequest(); + ctx = ServletActionContext.getActionContext(httpRequest); + } + if (request instanceof JspRequest) { + HttpServletRequest httpRequest = (HttpServletRequest) ((JspRequest) request).getPageContext().getRequest(); + ctx = ServletActionContext.getActionContext(httpRequest); + } + + if (ctx == null) { + throw new ConfigurationException("There is no ActionContext for current request!"); + } + + return ctx; + } + @Override public boolean isRenderable(String path, Request request) { return path != null && path.startsWith("/") && path.endsWith(".ftl");
