You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2016/01/18 15:57:06 UTC
[24/30] struts git commit: Simplifies logic to fetch
HttpServletRequest
Simplifies logic to fetch HttpServletRequest
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/b5c96a58
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/b5c96a58
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/b5c96a58
Branch: refs/heads/master
Commit: b5c96a5888eb3a7b7ca6acbd857b38bda51e2f87
Parents: 5bd54cf
Author: Lukasz Lenart <lu...@gmail.com>
Authored: Thu Jan 14 08:17:50 2016 +0100
Committer: Lukasz Lenart <lu...@gmail.com>
Committed: Thu Jan 14 08:17:50 2016 +0100
----------------------------------------------------------------------
.../tiles/StrutsFreeMarkerAttributeRenderer.java | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/b5c96a58/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 0b19b1d..5102ead 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,9 +36,8 @@ 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 org.apache.tiles.request.servlet.ServletUtil;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
@@ -81,18 +80,10 @@ public class StrutsFreeMarkerAttributeRenderer implements Renderer {
* or a ServletRequest (FreeMarker)
*/
protected ActionContext readActionContext(Request request) {
- ActionContext ctx = null;
-
LOG.debug("Obtaining HttpServletRequest based on [{}]", request.getClass().getName());
- 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);
- }
+ HttpServletRequest httpRequest = ServletUtil.getServletRequest(request).getRequest();
+ ActionContext ctx = ServletActionContext.getActionContext(httpRequest);
if (ctx == null) {
LOG.error("Cannot obtain HttpServletRequest from [{}]", request.getClass().getName());