[
https://issues.apache.org/jira/browse/WW-5141?focusedWorklogId=895704&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-895704
]
ASF GitHub Bot logged work on WW-5141:
--------------------------------------
Author: ASF GitHub Bot
Created on: 14/Dec/23 18:27
Start Date: 14/Dec/23 18:27
Worklog Time Spent: 10m
Work Description: sepe81 commented on code in PR #778:
URL: https://github.com/apache/struts/pull/778#discussion_r1427104760
##########
core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java:
##########
@@ -72,16 +73,16 @@ public void parse(HttpServletRequest request, String
saveDir) throws IOException
} catch (FileUploadException e) {
LOG.debug("Request exceeded size limit!", e);
LocalizedMessage errorMessage;
- if (e instanceof FileUploadBase.SizeLimitExceededException) {
- FileUploadBase.SizeLimitExceededException ex =
(FileUploadBase.SizeLimitExceededException) e;
- errorMessage = buildErrorMessage(e, new
Object[]{ex.getPermittedSize(), ex.getActualSize()});
- } else if (e instanceof
FileUploadBase.FileSizeLimitExceededException) {
- FileUploadBase.FileSizeLimitExceededException ex =
(FileUploadBase.FileSizeLimitExceededException) e;
- errorMessage = buildErrorMessage(e, new
Object[]{ex.getFileName(), ex.getPermittedSize(), ex.getActualSize()});
- } else if (e instanceof FileCountLimitExceededException) {
- FileCountLimitExceededException ex =
(FileCountLimitExceededException) e;
- errorMessage = buildErrorMessage(e, new
Object[]{ex.getLimit()});
- } else {
+ if (e instanceof FileUploadByteCountLimitException) {
+ FileUploadByteCountLimitException ex =
(FileUploadByteCountLimitException) e;
+ errorMessage = buildErrorMessage(e, new
Object[]{ex.getFileName(), ex.getPermitted(), ex.getActualSize()});
+ } else if (e instanceof FileUploadFileCountLimitException) {
+ FileUploadFileCountLimitException ex =
(FileUploadFileCountLimitException) e;
+ errorMessage = buildErrorMessage(e, new
Object[]{ex.getPermitted()});
+ } else if (e instanceof FileUploadSizeException) {
+ FileUploadSizeException ex = (FileUploadSizeException) e;
+ errorMessage = buildErrorMessage(e, new
Object[]{ex.getPermitted(), ex.getActualSize()});
+ } else {
Review Comment:
```suggestion
} else {
```
revert indentation
Issue Time Tracking
-------------------
Worklog Id: (was: 895704)
Time Spent: 7h 40m (was: 7.5h)
> Support for JEE 9+
> -------------------
>
> Key: WW-5141
> URL: https://issues.apache.org/jira/browse/WW-5141
> Project: Struts 2
> Issue Type: New Feature
> Components: Core
> Reporter: Daniel Le Berre
> Priority: Major
> Labels: M1
> Fix For: 7.0.0
>
> Attachments: pom.xml
>
> Time Spent: 7h 40m
> Remaining Estimate: 0h
>
> JEE 9 breaks the JEE API by replacing javax domain by jakarta.
> Tomcat 10 implements some specifications of JEE 9.
> Struts 2.5 has some dependencies with the javax servlet API.
> Struts would require some changes to run on Tomcat 10+.
> Is there any plan to support JEE 9+ in the future?
>
--
This message was sent by Atlassian Jira
(v8.20.10#820010)
