Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-06 15:17:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1445 from ryanmurf/multipartCleanup

Browse Source 
WW-5573  Multipart stream file cleanup
This commit is contained in:
Ryan J Murphy
2025-12-11 04:48:13 -07:00
committed by GitHub
parent d5bff6aef8
commit b490e2c2fc
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
+4 -5
View File
@@ -103,12 +103,11 @@ public class JakartaMultiPartRequest extends AbstractMultiPartRequest {
protected void processUpload(HttpServletRequest request, String saveDir) throws FileUploadException, UnsupportedEncodingException {
if (ServletFileUpload.isMultipartContent(request)) {
for (FileItem item : parseRequest(request, saveDir)) {
// Track all FileItem instances for comprehensive cleanup - addAll in case exception in for loop
allFileItems.addAll(parseRequest(request, saveDir));
for (FileItem item : allFileItems) {
LOG.debug("Found file item: [{}]", normalizeSpace(item.getFieldName()));
// Track all FileItem instances for comprehensive cleanup
allFileItems.add(item);
if (item.isFormField()) {
processNormalFormField(item, request.getCharacterEncoding());
} else {
core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java
+10 -4
View File
@@ -76,10 +76,16 @@ public class JakartaStreamMultiPartRequest extends AbstractMultiPartRequest {
LOG.debug("Performing File Upload temporary storage cleanup.");
for (List<FileInfo> fileInfoList : fileInfos.values()) {
for (FileInfo fileInfo : fileInfoList) {
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());
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());
}
} catch (Exception e) {
LOG.warn("Error during cleanup of file item: [{}]", normalizeSpace(fileInfo.getOriginalName()), e);
}
}
}