Merge pull request #846 from zalando/bugfix/empty-chunk

Fixes chunking of empty bodies.
zalando · Sep 29, 2020 · e9c7ea1 · e9c7ea1
2 parents 7b87133 + 71e4be5
commit e9c7ea1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/logbook-core/src/main/java/org/zalando/logbook/ChunkingSink.java b/logbook-core/src/main/java/org/zalando/logbook/ChunkingSink.java
@@ -48,6 +48,10 @@ public void write(final Correlation correlation, final HttpRequest request, fina
     }
 
     private Stream<String> chunk(final HttpMessage message) throws IOException {
+        if (message.getBodyAsString().isEmpty()) {
+            return Stream.of("");
+        }
+
         return stream(new ChunkingSpliterator(message.getBodyAsString(), minChunkSize, maxChunkSize), false);
     }
 

diff --git a/logbook-core/src/test/java/org/zalando/logbook/ChunkingSinkTest.java b/logbook-core/src/test/java/org/zalando/logbook/ChunkingSinkTest.java
@@ -29,10 +29,19 @@ final class ChunkingSinkTest {
     private final Sink unit = new ChunkingSink(delegate, 20);
 
     @Test
-    void shouldDelegateActive() {
+    void delegatesActive() {
         assertThat(unit.isActive(), is(false));
     }
 
+    @Test
+    void ignoresEmptyBodies() throws IOException {
+        final List<String> strings = captureRequest("");
+
+        assertThat(strings, contains(
+                allOf(startsWith("Incoming Request"))
+        ));
+    }
+
     @Test
     void shouldWriteSingleRequestIfLengthNotExceeded() throws IOException {
         final List<String> chunks = captureRequest("HelloWorld");