From fa7c8cbe5cfa195b471245dc1dd3486ceee50420 Mon Sep 17 00:00:00 2001
From: Paul Heaberlin <paul.heaberlin@jetisre.com>
Date: Tue, 22 Aug 2017 17:01:05 -0500
Subject: [PATCH] return request HTTP method to fix problem with multipart
 validation added to Dispatcher in WW-4768 and JakartaMultiPartRequest in
 WW-4767

---
 .../struts2/portlet/servlet/PortletServletRequest.java    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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 cabc9d473..a224e1413 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;
+		}
 	}
 
 	/*