Fix copying of zero length resources

gregw · gregw · commit 1abce9d2b08b · 2025-10-10T21:35:45.000+11:00
Fix #14685 by handling zero length resources
diff --git a/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/internal/ByteChannelContentSource.java b/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/internal/ByteChannelContentSource.java
@@ -156,15 +156,15 @@ public Content.Chunk read()
         {
             lockedEnsureOpenOrTerminal();
 
+            if (_terminal != null)
+                return _terminal;
+
             if (_length == 0)
             {
                 lockedSetTerminal(Content.Chunk.EOF);
                 return Content.Chunk.EOF;
             }
 
-            if (_terminal != null)
-                return _terminal;
-
             if (_buffer == null)
             {
                 _buffer = _byteBufferPool.acquire();

Original file line number	Diff line number	Diff line change
`@@ -156,15 +156,15 @@ public Content.Chunk read()`
`156`	`156`	`{`
`157`	`157`	`lockedEnsureOpenOrTerminal();`
`158`	`158`
	`159`	`+ if (_terminal != null)`
	`160`	`+ return _terminal;`
	`161`	`+`
`159`	`162`	`if (_length == 0)`
`160`	`163`	`{`
`161`	`164`	`lockedSetTerminal(Content.Chunk.EOF);`
`162`	`165`	`return Content.Chunk.EOF;`
`163`	`166`	`}`
`164`	`167`
`165`		`- if (_terminal != null)`
`166`		`- return _terminal;`
`167`		`-`
`168`	`168`	`if (_buffer == null)`
`169`	`169`	`{`
`170`	`170`	`_buffer = _byteBufferPool.acquire();`