struts-extras git commit: Update README.md

[lukaszlenart]

Repository: struts-extras
Updated Branches:
  refs/heads/master abfe90aea -> 4d4aa62fe


Update README.md

Fixed class name in bean definitions

Project: http://git-wip-us.apache.org/repos/asf/struts-extras/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-extras/commit/4d4aa62f
Tree: http://git-wip-us.apache.org/repos/asf/struts-extras/tree/4d4aa62f
Diff: http://git-wip-us.apache.org/repos/asf/struts-extras/diff/4d4aa62f

Branch: refs/heads/master
Commit: 4d4aa62fefa44fda4c796f6b832e5c304ddd6779
Parents: abfe90a
Author: Chris 
Authored: Wed Mar 22 08:40:18 2017 -0500
Committer: GitHub 
Committed: Wed Mar 22 08:40:18 2017 -0500

--
 struts2-secure-jakarta-multipart-parser-plugin/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts-extras/blob/4d4aa62f/struts2-secure-jakarta-multipart-parser-plugin/README.md
--
diff --git a/struts2-secure-jakarta-multipart-parser-plugin/README.md 
b/struts2-secure-jakarta-multipart-parser-plugin/README.md
index b908c01..c3443df 100644
--- a/struts2-secure-jakarta-multipart-parser-plugin/README.md
+++ b/struts2-secure-jakarta-multipart-parser-plugin/README.md
@@ -20,7 +20,7 @@ Just drop the jar into `WEB-INF/libs` folder and add the 
bellow definition into
 - if you are running the Apache Struts 2.3.8 - 2.3.31
  ```xml
   
 
@@ -30,7 +30,7 @@ Just drop the jar into `WEB-INF/libs` folder and add the 
bellow definition into
 - if you are running the Apache Struts 2.5 - 2.5.5
  ```xml
   
 

struts git commit: WW-4767 Makes some methods protected instead private to allow override them when subclassing

[lukaszlenart]

Repository: struts
Updated Branches:
  refs/heads/master 6dcff10a6 -> 82f61666f


WW-4767 Makes some methods protected instead private to allow override them 
when subclassing


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/82f61666
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/82f61666
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/82f61666

Branch: refs/heads/master
Commit: 82f61666f8f8337f4aa23e5ed38d66aa12f87b4c
Parents: 6dcff10
Author: Lukasz Lenart 
Authored: Thu Mar 23 07:14:32 2017 +0100
Committer: Lukasz Lenart 
Committed: Thu Mar 23 07:14:32 2017 +0100

--
 .../multipart/AbstractMultiPartRequest.java | 17 +
 .../multipart/JakartaMultiPartRequest.java  | 32 
 .../JakartaStreamMultiPartRequest.java  | 39 ++--
 3 files changed, 37 insertions(+), 51 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/82f61666/core/src/main/java/org/apache/struts2/dispatcher/multipart/AbstractMultiPartRequest.java
--
diff --git 
a/core/src/main/java/org/apache/struts2/dispatcher/multipart/AbstractMultiPartRequest.java
 
b/core/src/main/java/org/apache/struts2/dispatcher/multipart/AbstractMultiPartRequest.java
index cc20523..10ed6cd 100644
--- 
a/core/src/main/java/org/apache/struts2/dispatcher/multipart/AbstractMultiPartRequest.java
+++ 
b/core/src/main/java/org/apache/struts2/dispatcher/multipart/AbstractMultiPartRequest.java
@@ -107,4 +107,21 @@ public abstract class AbstractMultiPartRequest implements 
MultiPartRequest {
 return errors;
 }
 
+/**
+ * @param originalFileName file name
+ * @return the canonical name based on the supplied filename
+ */
+protected String getCanonicalName(final String originalFileName) {
+String fileName = originalFileName;
+
+int forwardSlash = fileName.lastIndexOf("/");
+int backwardSlash = fileName.lastIndexOf("\\");
+if (forwardSlash != -1 && forwardSlash > backwardSlash) {
+fileName = fileName.substring(forwardSlash + 1, fileName.length());
+} else {
+fileName = fileName.substring(backwardSlash + 1, 
fileName.length());
+}
+return fileName;
+}
+
 }

http://git-wip-us.apache.org/repos/asf/struts/blob/82f61666/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
--
diff --git 
a/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
 
b/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
index e6fab1e..68bbd2b 100644
--- 
a/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
+++ 
b/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
@@ -87,12 +87,14 @@ public class JakartaMultiPartRequest extends 
AbstractMultiPartRequest {
 }
 
 protected void processUpload(HttpServletRequest request, String saveDir) 
throws FileUploadException, UnsupportedEncodingException {
-for (FileItem item : parseRequest(request, saveDir)) {
-LOG.debug("Found file item: [{}]", item.getFieldName());
-if (item.isFormField()) {
-processNormalFormField(item, request.getCharacterEncoding());
-} else {
-processFileField(item);
+if (ServletFileUpload.isMultipartContent(request)) {
+for (FileItem item : parseRequest(request, saveDir)) {
+LOG.debug("Found file item: [{}]", item.getFieldName());
+if (item.isFormField()) {
+processNormalFormField(item, 
request.getCharacterEncoding());
+} else {
+processFileField(item);
+}
 }
 }
 }
@@ -281,24 +283,6 @@ public class JakartaMultiPartRequest extends 
AbstractMultiPartRequest {
 }
 
 /**
- * Returns the canonical name of the given file.
- *
- * @param filename the given file
- * @return the canonical name of the given file
- */
-private String getCanonicalName(String filename) {
-int forwardSlash = filename.lastIndexOf("/");
-int backwardSlash = filename.lastIndexOf("\\");
-if (forwardSlash != -1 && forwardSlash > backwardSlash) {
-filename = filename.substring(forwardSlash + 1, filename.length());
-} else if (backwardSlash != -1 && backwardSlash >= forwardSlash) {
-filename = filename.substring(backwardSlash + 1, 
filename.length());
-}
-
-return filename;
-}
-
-/**
  * Creates a RequestContext needed by Jakarta C