(struts) branch main updated: introduce private method to remove clones (#1666)

[lukaszlenart]

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/struts.git


The following commit(s) were added to refs/heads/main by this push:
     new f4c634928 introduce private method to remove clones (#1666)
f4c634928 is described below

commit f4c634928337f8114b03be2adcc8349e9d6c7358
Author: aaaZayne <1138069...@qq.com>
AuthorDate: Mon Apr 20 14:57:28 2026 +1000

    introduce private method to remove clones (#1666)
    
    * introduce private method to remove clones
    
    * Update naming
---
 .../multipart/AbstractMultiPartRequest.java        | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

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 0a9966556..3bb0d17d2 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
@@ -241,9 +241,7 @@ public abstract class AbstractMultiPartRequest implements 
MultiPartRequest {
             LocalizedMessage localizedMessage = new 
LocalizedMessage(this.getClass(),
                     STRUTS_MESSAGES_UPLOAD_ERROR_PARAMETER_TOO_LONG_KEY, null,
                     new Object[]{fieldName, maxStringLength, 
fieldValue.length()});
-            if (!errors.contains(localizedMessage)) {
-                errors.add(localizedMessage);
-            }
+            addErrorIfAbsent(localizedMessage);
             return true;
         }
         return false;
@@ -278,15 +276,17 @@ public abstract class AbstractMultiPartRequest implements 
MultiPartRequest {
             }
 
             LocalizedMessage errorMessage = buildErrorMessage(exClass, 
e.getMessage(), args);
-            if (!errors.contains(errorMessage)) {
-                errors.add(errorMessage);
-            }
+            addErrorIfAbsent(errorMessage);
         } catch (IOException e) {
             LOG.warn("Unable to parse request", e);
             LocalizedMessage errorMessage = buildErrorMessage(e.getClass(), 
e.getMessage(), new Object[]{});
-            if (!errors.contains(errorMessage)) {
-                errors.add(errorMessage);
-            }
+            addErrorIfAbsent(errorMessage);
+        }
+    }
+
+    private void addErrorIfAbsent(LocalizedMessage errorMessage) {
+        if (!errors.contains(errorMessage)) {
+            errors.add(errorMessage);
         }
     }
 
@@ -449,9 +449,7 @@ public abstract class AbstractMultiPartRequest implements 
MultiPartRequest {
                     "Empty files are not allowed",
                     new Object[]{fileName, fieldName}
             );
-            if (!errors.contains(errorMessage)) {
-                errors.add(errorMessage);
-            }
+            addErrorIfAbsent(errorMessage);
             return true;
         }
         return false;