Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9357 from eclipse/jetty-12.0.x-9336-ChunksPart 

Issue #9336 - remember ContentSources to fail from ChunksPart
This commit is contained in:
Lachlan 2023-02-16 10:40:08 +11:00 committed by GitHub
parent 86c02e35fa 5775887786
commit b0fa9e20cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/MultiPart.java
View File

@ -24,6 +24,7 @@ import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.StandardCopyOption; import java.nio.file.StandardCopyOption;
import java.util.ArrayDeque; import java.util.ArrayDeque;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -120,7 +121,7 @@ public class MultiPart
*/ */
public abstract static class Part implements Closeable public abstract static class Part implements Closeable
{ {
private static final Throwable CLOSE_EXCEPTION = new StaticException("Closed"); static final Throwable CLOSE_EXCEPTION = new StaticException("Closed");
private final String name; private final String name;
private final String fileName; private final String fileName;
@ -347,6 +348,9 @@ public class MultiPart
public static class ChunksPart extends Part public static class ChunksPart extends Part
{ {
private final List<Content.Chunk> content; private final List<Content.Chunk> content;
private final List<Content.Source> contentSources = new ArrayList<>();
private final AutoLock lock = new AutoLock();
private boolean closed = false;
public ChunksPart(String name, String fileName, HttpFields fields, List<Content.Chunk> content) public ChunksPart(String name, String fileName, HttpFields fields, List<Content.Chunk> content)
{ {
@ -358,17 +362,36 @@ public class MultiPart
@Override @Override
public Content.Source newContentSource() public Content.Source newContentSource()
{ {
List<Content.Chunk> newChunks = content.stream() try (AutoLock l = lock.lock())
.map(chunk -> Content.Chunk.from(chunk.getByteBuffer().slice(), chunk.isLast())) {
.toList(); if (closed)
return new ChunksContentSource(newChunks); return null;
ChunksContentSource newContentSource = new ChunksContentSource(content.stream()
.map(chunk -> Content.Chunk.from(chunk.getByteBuffer().slice(), chunk.isLast()))
.toList());
contentSources.add(newContentSource);
return newContentSource;
}
} }
@Override @Override
public void close() public void close()
{ {
List<Content.Source> contentSourcesToFail = null;
try (AutoLock l = lock.lock())
{
closed = true;
if (!contentSources.isEmpty())
{
contentSourcesToFail = new ArrayList<>(contentSources);
contentSources.clear();
}
}
super.close(); super.close();
content.forEach(Content.Chunk::release); content.forEach(Content.Chunk::release);
if (contentSourcesToFail != null)
contentSourcesToFail.forEach(cs -> cs.fail(CLOSE_EXCEPTION));
} }
@Override @Override