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 D9E77200D08 for ; Wed, 23 Aug 2017 07:44:43 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id D86D2168425; Wed, 23 Aug 2017 05:44:43 +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 2A634168422 for ; Wed, 23 Aug 2017 07:44:43 +0200 (CEST) Received: (qmail 55745 invoked by uid 500); 23 Aug 2017 05:44:41 -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 55735 invoked by uid 99); 23 Aug 2017 05:44:41 -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; Wed, 23 Aug 2017 05:44:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B7A45E0618; Wed, 23 Aug 2017 05:44:41 +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: Wed, 23 Aug 2017 05:44:41 -0000 Message-Id: <4c163cbed3e046389b82bc7d173ac280@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] struts git commit: return request HTTP method to fix problem with multipart validation added to Dispatcher in WW-4768 and JakartaMultiPartRequest in WW-4767 archived-at: Wed, 23 Aug 2017 05:44:44 -0000 Repository: struts Updated Branches: refs/heads/master 44036f4e3 -> 853b44611 return request HTTP method to fix problem with multipart validation added to Dispatcher in WW-4768 and JakartaMultiPartRequest in WW-4767 Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/fa7c8cbe Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/fa7c8cbe Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/fa7c8cbe Branch: refs/heads/master Commit: fa7c8cbe5cfa195b471245dc1dd3486ceee50420 Parents: 1949471 Author: Paul Heaberlin Authored: Tue Aug 22 17:01:05 2017 -0500 Committer: Paul Heaberlin Committed: Tue Aug 22 17:01:05 2017 -0500 ---------------------------------------------------------------------- .../struts2/portlet/servlet/PortletServletRequest.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/fa7c8cbe/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletRequest.java ---------------------------------------------------------------------- diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletRequest.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletRequest.java index cabc9d4..a224e14 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletRequest.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletRequest.java @@ -31,6 +31,7 @@ import java.util.Locale; import java.util.Map; import javax.portlet.ActionRequest; +import javax.portlet.ClientDataRequest; import javax.portlet.PortletContext; import javax.portlet.PortletRequest; import javax.portlet.PortletRequestDispatcher; @@ -161,7 +162,12 @@ public class PortletServletRequest implements HttpServletRequest { * @see javax.servlet.http.HttpServletRequest#getMethod() */ public String getMethod() { - return null; + if (portletRequest instanceof ClientDataRequest) { + return ((ClientDataRequest) portletRequest).getMethod(); + } + else { + return null; + } } /*