struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lukaszlen...@apache.org
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
Date Wed, 23 Aug 2017 05:44:41 GMT
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 <paul.heaberlin@jetisre.com>
Authored: Tue Aug 22 17:01:05 2017 -0500
Committer: Paul Heaberlin <paul.heaberlin@jetisre.com>
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;
+		}
 	}
 
 	/*


Mime
View raw message