Refine offset, length size handling in Content.Sources

jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/internal/ByteChannelContentSource.java

@@ -155,6 +155,13 @@ public Content.Chunk read()
         try (AutoLock ignored = lock.lock())
         {
             lockedEnsureOpenOrTerminal();
+
+            if (_length == 0)
+            {
+                lockedSetTerminal(Content.Chunk.EOF);
+                return Content.Chunk.EOF;
+            }
+
             if (_terminal != null)
                 return _terminal;
 
@@ -172,7 +179,7 @@ else if (_buffer.isRetained())
             {
                 ByteBuffer byteBuffer = _buffer.getByteBuffer();
                 BufferUtil.clearToFill(byteBuffer);
-                if (_length >= 0)
+                if (_length > 0)
                     byteBuffer.limit((int)Math.min(_buffer.capacity(), _length - _totalRead));
                 int read = _byteChannel.read(byteBuffer);
                 BufferUtil.flipToFlush(byteBuffer, 0);

jetty-core/jetty-io/src/test/java/org/eclipse/jetty/io/IOResourcesTest.java

@@ -142,10 +142,13 @@ public Content.Source newContentSource(ByteBufferPool.Sized bufferPool, long off
     public static Stream<Resource> all() throws Exception
     {
         Path testResourcePath = MavenTestingUtils.getTestResourcePath("keystore.p12");
+
         URI resourceUri = testResourcePath.toUri();
         return Stream.of(
             ResourceFactory.root().newResource(resourceUri),
             ResourceFactory.root().newMemoryResource(resourceUri.toURL()),
+            ResourceFactory.root().newResource(MavenTestingUtils.getTestResourcePath("zero")),
+            ResourceFactory.root().newResource(MavenTestingUtils.getTestResourcePath("one")),
             new URLResourceFactory().newResource(resourceUri),
             new TestContentSourceFactoryResource(resourceUri, Files.readAllBytes(testResourcePath))
         );
@@ -181,12 +184,13 @@ public void testAsContentSourceWithFirst(Resource resource) throws Exception
     {
         TestSink sink = new TestSink();
         Callback.Completable callback = new Callback.Completable();
+
         Content.Source contentSource = IOResources.asContentSource(resource, bufferPool, 100, -1);
         Content.copy(contentSource, sink, callback);
         callback.get();
         List<Content.Chunk> chunks = sink.takeAccumulatedChunks();
         long sum = chunks.stream().mapToLong(Content.Chunk::remaining).sum();
-        assertThat(sum, is(resource.length() - 100L));
+        assertThat(sum, is(Math.max(0L, resource.length() - 100L)));
         assertThat(chunks.get(chunks.size() - 1).isLast(), is(true));
     }
 
@@ -201,7 +205,7 @@ public void testAsContentSourceWithLength(Resource resource) throws Exception
         callback.get();
         List<Content.Chunk> chunks = sink.takeAccumulatedChunks();
         long sum = chunks.stream().mapToLong(Content.Chunk::remaining).sum();
-        assertThat(sum, is(500L));
+        assertThat(sum, is(Math.min(resource.length(), 500L)));
         assertThat(chunks.get(chunks.size() - 1).isLast(), is(true));
     }
 
@@ -211,12 +215,15 @@ public void testAsContentSourceWithFirstAndLength(Resource resource) throws Exce
     {
         TestSink sink = new TestSink();
         Callback.Completable callback = new Callback.Completable();
-        Content.Source contentSource = IOResources.asContentSource(resource, bufferPool, 100, 500);
+
+        long offset = Math.min(resource.length(), 100);
+        long length = Math.min(resource.length() - offset, 500);
+        Content.Source contentSource = IOResources.asContentSource(resource, bufferPool, offset, length);
         Content.copy(contentSource, sink, callback);
         callback.get();
         List<Content.Chunk> chunks = sink.takeAccumulatedChunks();
         long sum = chunks.stream().mapToLong(Content.Chunk::remaining).sum();
-        assertThat(sum, is(500L));
+        assertThat(sum, is(length));
         assertThat(chunks.get(chunks.size() - 1).isLast(), is(true));
     }
 
@@ -240,11 +247,12 @@ public void testCopyWithFirst(Resource resource) throws Exception
     {
         TestSink sink = new TestSink();
         Callback.Completable callback = new Callback.Completable();
-        IOResources.copy(resource, sink, bufferPool, 100, -1, callback);
+        long offset = Math.min(resource.length(), 100);
+        IOResources.copy(resource, sink, bufferPool, offset, -1, callback);
         callback.get();
         List<Content.Chunk> chunks = sink.takeAccumulatedChunks();
         long sum = chunks.stream().mapToLong(Content.Chunk::remaining).sum();
-        assertThat(sum, is(resource.length() - 100L));
+        assertThat(sum, is(Math.max(0L, resource.length() - 100L)));
         assertThat(chunks.get(chunks.size() - 1).isLast(), is(true));
     }
 
@@ -254,11 +262,12 @@ public void testCopyWithLength(Resource resource) throws Exception
     {
         TestSink sink = new TestSink();
         Callback.Completable callback = new Callback.Completable();
-        IOResources.copy(resource, sink, bufferPool, 0, 500, callback);
+        long length = resource.length() >= 0 ? Math.min(resource.length(), 500) : 500;
+        IOResources.copy(resource, sink, bufferPool, 0, length, callback);
         callback.get();
         List<Content.Chunk> chunks = sink.takeAccumulatedChunks();
         long sum = chunks.stream().mapToLong(Content.Chunk::remaining).sum();
-        assertThat(sum, is(500L));
+        assertThat(sum, is(length));
         assertThat(chunks.get(chunks.size() - 1).isLast(), is(true));
     }
 
@@ -268,11 +277,13 @@ public void testCopyWithFirstAndLength(Resource resource) throws Exception
     {
         TestSink sink = new TestSink();
         Callback.Completable callback = new Callback.Completable();
-        IOResources.copy(resource, sink, bufferPool, 100, 500, callback);
+        long offset = Math.min(resource.length(), 100);
+        long length = Math.min(resource.length() - offset, 500);
+        IOResources.copy(resource, sink, bufferPool, offset, length, callback);
         callback.get();
         List<Content.Chunk> chunks = sink.takeAccumulatedChunks();
         long sum = chunks.stream().mapToLong(Content.Chunk::remaining).sum();
-        assertThat(sum, is(500L));
+        assertThat(sum, is(length));
         assertThat(chunks.get(chunks.size() - 1).isLast(), is(true));
     }
 

jetty-core/jetty-io/src/test/resources/one

@@ -0,0 +1 @@
+1