#8993: fix wrong usages of from(ByteBuffer,boolean)

Signed-off-by: Ludovic Orban <lorban@bitronix.be>
jetty · Dec 6, 2022 · 3ccb0da · 3ccb0da
1 parent 8fbc5c9
commit 3ccb0da
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 7 deletions.
diff --git a/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/MultiPart.java b/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/MultiPart.java
@@ -624,7 +624,7 @@ public Content.Chunk read()
                     // TODO: use a ByteBuffer pool and direct ByteBuffers?
                     ByteBuffer byteBuffer = UTF_8.encode(builder.toString());
                     state = State.CONTENT;
-                    yield Content.Chunk.from(byteBuffer, false);
+                    yield Content.Chunk.from(byteBuffer, false, () -> {});
                 }
                 case CONTENT ->
                 {

diff --git a/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/content/ByteBufferContentSource.java b/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/content/ByteBufferContentSource.java
@@ -78,9 +78,7 @@ public Content.Chunk read()
             if (last)
                 terminated = Content.Chunk.EOF;
         }
-        if (!buffer.hasRemaining())
-            return last ? Content.Chunk.EOF : Content.Chunk.EMPTY;
-        return Content.Chunk.from(buffer, last);
+        return Content.Chunk.from(buffer, last, () -> {});
     }
 
     @Override

diff --git a/jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/MockHttpStream.java b/jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/MockHttpStream.java
@@ -33,7 +33,31 @@
 public class MockHttpStream implements HttpStream
 {
     private static final Throwable SUCCEEDED = new Throwable();
-    private static final Content.Chunk DEMAND = Content.Chunk.EMPTY;
+    private static final Content.Chunk DEMAND = new Content.Chunk() {
+        @Override
+        public ByteBuffer getByteBuffer()
+        {
+            return BufferUtil.EMPTY_BUFFER;
+        }
+
+        @Override
+        public boolean isLast()
+        {
+            return false;
+        }
+
+        @Override
+        public void retain()
+        {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public boolean release()
+        {
+            return true;
+        }
+    };
     private final long _nanoTime = NanoTime.now();
     private final AtomicReference<Content.Chunk> _content = new AtomicReference<>();
     private final AtomicReference<Throwable> _complete = new AtomicReference<>();
@@ -65,7 +89,7 @@ public boolean isDemanding()
 
     public Runnable addContent(ByteBuffer buffer, boolean last)
     {
-        return addContent((last && BufferUtil.isEmpty(buffer)) ? Content.Chunk.EOF : Content.Chunk.from(buffer, last));
+        return addContent(Content.Chunk.from(buffer, last, () -> {}));
     }
 
     public Runnable addContent(String content, boolean last)

diff --git a/...y-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletMultiPartFormData.java b/...y-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletMultiPartFormData.java
@@ -107,7 +107,7 @@ private Parts parse(ServletContextRequest.ServletApiRequest request) throws IOEx
                 formData.parse(Content.Chunk.EOF);
                 break;
             }
-            formData.parse(Content.Chunk.from(ByteBuffer.wrap(buffer, 0, read), false));
+            formData.parse(Content.Chunk.from(ByteBuffer.wrap(buffer, 0, read), false, () -> {}));
         }
 
         return new Parts(formData);