mirror of
https://github.com/apache/struts.git
synced 2026-08-06 07:06:58 +00:00
introduce private method to remove clones (#1666)
* introduce private method to remove clones * Update naming
This commit is contained in:
+10
-12
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user