Skip to content

introduce private method to remove clones #1666

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lukaszlenart merged 2 commits into from
Apr 20, 2026
Merged

introduce private method to remove clones #1666

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c4b9cd
introduce private method to remove clones
aaaZayne Apr 19, 2026
46dd12d
Update naming
aaaZayne Apr 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 10 additions & 12 deletions core/src/main/java/org/apache/struts2/dispatcher/multipart/AbstractMultiPartRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,9 +241,7 @@ protected boolean exceedsMaxStringLength(String fieldName, String fieldValue) {
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;
Expand Down Expand Up @@ -278,15 +276,17 @@ public void parse(HttpServletRequest request, String saveDir) throws IOException
}

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);
}
}

Expand Down Expand Up @@ -449,9 +449,7 @@ protected boolean rejectEmptyFile(long fileSize, String fileName, String fieldNa
"Empty files are not allowed",
new Object[]{fileName, fieldName}
);
if (!errors.contains(errorMessage)) {
errors.add(errorMessage);
}
addErrorIfAbsent(errorMessage);
return true;
}
return false;
Expand Down
Loading