Skip to content

WW-5616 - JakartaStreamMultiPartRequest warns on file delete if the file doesn't exist #1591

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 1 commit into from
Feb 22, 2026
Merged

WW-5616 - JakartaStreamMultiPartRequest warns on file delete if the file doesn't exist #1591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 8 additions & 4 deletions core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,10 +373,14 @@ public void cleanUp() {
if (item instanceof DiskFileItem) {
DiskFileItem diskItem = (DiskFileItem) item;
File storeLocation = diskItem.getStoreLocation();
if (storeLocation != null && storeLocation.exists()) {
LOG.debug("Deleting temporary file: [{}]", storeLocation.getName());
if (!storeLocation.delete()) {
LOG.warn("Unable to delete temporary file: [{}]", storeLocation.getName());
if (storeLocation != null) {
if(storeLocation.isFile()) {
LOG.debug("Deleting file: {}", storeLocation.getName());
if (!storeLocation.delete()) {
LOG.warn("There was a problem attempting to delete file: {}", storeLocation.getName());
}
} else {
LOG.debug("File: {} already deleted", storeLocation.getName());
}
}
}
Expand Down
14 changes: 10 additions & 4 deletions .../src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,16 @@ public void cleanUp() {
try {
// catch any exceptions during cleanup to ensure all files are deleted.
File file = fileInfo.getFile();
LOG.debug("Deleting file '{}'.", file.getName());
if (!file.delete()) {
LOG.warn("There was a problem attempting to delete file [{}].",
file.getName());
if(file != null) {
if(file.isFile()) {
LOG.debug("Deleting file: {}", file.getName());
if (!file.delete()) {
LOG.warn("There was a problem attempting to delete file: {}",
file.getName());
}
} else {
LOG.debug("File: {} already deleted", file.getName());
}
}
} catch (Exception e) {
LOG.warn("Error during cleanup of file item: [{}]", normalizeSpace(fileInfo.getOriginalName()), e);
Expand Down