Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id C39C3200B45 for ; Fri, 15 Jul 2016 15:18:42 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id C2338160A79; Fri, 15 Jul 2016 13:18:42 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 1B0C8160A61 for ; Fri, 15 Jul 2016 15:18:41 +0200 (CEST) Received: (qmail 33821 invoked by uid 500); 15 Jul 2016 13:18:30 -0000 Mailing-List: contact commits-help@struts.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@struts.apache.org Delivered-To: mailing list commits@struts.apache.org Received: (qmail 32389 invoked by uid 99); 15 Jul 2016 13:18:29 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Jul 2016 13:18:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id AC106E968B; Fri, 15 Jul 2016 13:18:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: lukaszlenart@apache.org To: commits@struts.apache.org Date: Fri, 15 Jul 2016 13:19:03 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [36/50] [abbrv] struts git commit: Simplifies logic to fetch HttpServletRequest archived-at: Fri, 15 Jul 2016 13:18:42 -0000 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/4e36a545 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/4e36a545 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/4e36a545 Branch: refs/heads/master Commit: 4e36a54549d5d5f42b86315730c2d09312b85ea3 Parents: e53a119 Author: Lukasz Lenart Authored: Thu Jan 14 08:17:50 2016 +0100 Committer: Lukasz Lenart Committed: Tue Jan 19 16:19:19 2016 +0100 ---------------------------------------------------------------------- .../tiles/StrutsFreeMarkerAttributeRenderer.java | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/4e36a545/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());