#8993: fix javadoc + minor cleanups

Signed-off-by: Ludovic Orban <lorban@bitronix.be>
jetty · Dec 6, 2022 · 84eddd6 · 84eddd6
1 parent 6f16f46
commit 84eddd6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 19 deletions.
diff --git a/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/Content.java b/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/Content.java
@@ -463,12 +463,10 @@ static Chunk from(ByteBuffer byteBuffer, boolean last) throws IllegalArgumentExc
          */
         static Chunk from(ByteBuffer byteBuffer, boolean last, Runnable releaser)
         {
-            if (!byteBuffer.hasRemaining())
-            {
-                releaser.run();
-                return last ? EOF : EMPTY;
-            }
-            return new ByteBufferChunk.ReleasedByRunnable(byteBuffer, last, Objects.requireNonNull(releaser));
+            if (byteBuffer.hasRemaining())
+                return new ByteBufferChunk.ReleasedByRunnable(byteBuffer, last, Objects.requireNonNull(releaser));
+            releaser.run();
+            return last ? EOF : EMPTY;
         }
 
         /**
@@ -482,12 +480,10 @@ static Chunk from(ByteBuffer byteBuffer, boolean last, Runnable releaser)
          */
         static Chunk from(ByteBuffer byteBuffer, boolean last, Consumer<ByteBuffer> releaser)
         {
-            if (!byteBuffer.hasRemaining())
-            {
-                releaser.accept(byteBuffer);
-                return last ? EOF : EMPTY;
-            }
-            return new ByteBufferChunk.ReleasedByConsumer(byteBuffer, last, Objects.requireNonNull(releaser));
+            if (byteBuffer.hasRemaining())
+                return new ByteBufferChunk.ReleasedByConsumer(byteBuffer, last, Objects.requireNonNull(releaser));
+            releaser.accept(byteBuffer);
+            return last ? EOF : EMPTY;
         }
 
         /**
@@ -502,12 +498,10 @@ static Chunk from(ByteBuffer byteBuffer, boolean last, Consumer<ByteBuffer> rele
          */
         static Chunk from(ByteBuffer byteBuffer, boolean last, Retainable retainable)
         {
-            if (!byteBuffer.hasRemaining())
-            {
-                retainable.release();
-                return last ? EOF : EMPTY;
-            }
-            return new ByteBufferChunk.WithRetainable(byteBuffer, last, Objects.requireNonNull(retainable));
+            if (byteBuffer.hasRemaining())
+                return new ByteBufferChunk.WithRetainable(byteBuffer, last, Objects.requireNonNull(retainable));
+            retainable.release();
+            return last ? EOF : EMPTY;
         }
 
         /**

diff --git a/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/content/AsyncContent.java b/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/content/AsyncContent.java
@@ -64,7 +64,7 @@ public void write(boolean last, ByteBuffer byteBuffer, Callback callback)
     }
 
     /**
-     * <p>Writes the given {@link ByteBuffer}, notifying the {@link Callback} when the
+     * <p>Writes the given {@link Content.Chunk}, notifying the {@link Callback} when the
      * write is complete.</p>
      * <p>The callback completes:</p>
      * <ul>