serialization improvements: fix ByteBasedInputStream

Not all buffers start at zero. Signed-off-by: Erik Escher <eclipse@erikescher.de>
eclipse-ditto · Jan 17, 2020 · 187c593 · 187c593
1 parent c470af6
commit 187c593
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/json/src/main/java/org/eclipse/ditto/json/ByteBufferInputStream.java b/json/src/main/java/org/eclipse/ditto/json/ByteBufferInputStream.java
@@ -26,8 +26,11 @@ private ByteBufferInputStream(ByteBuffer byteBuffer){
     }
 
     static InputStream of(ByteBuffer byteBuffer){
-        if (byteBuffer.hasArray()){
-            return new ByteArrayInputStream(byteBuffer.array(), byteBuffer.arrayOffset(), byteBuffer.limit());
+        if (byteBuffer.hasArray()) {
+            return new ByteArrayInputStream(
+                    byteBuffer.array(),
+                    byteBuffer.arrayOffset() + byteBuffer.position(),
+                    byteBuffer.limit());
         }
         return new ByteBufferInputStream(byteBuffer);
     }

diff --git a/json/src/test/java/org/eclipse/ditto/json/ByteBufferInputStreamTest.java b/json/src/test/java/org/eclipse/ditto/json/ByteBufferInputStreamTest.java
@@ -32,6 +32,7 @@ public class ByteBufferInputStreamTest {
         for (int i = 0; i < length; i++) {
             buffer.put((byte) i);
         }
+        buffer.flip();
         final InputStream stream = ByteBufferInputStream.of(buffer);
         for (int i = 0; i < length; i++) {
             assertThat(stream.read()).isEqualTo(i);
@@ -48,6 +49,7 @@ public class ByteBufferInputStreamTest {
         for (int i = 0; i < totalLength; i++) {
             buffer.put(TESTVALUE);
         }
+        buffer.flip();
         final InputStream stream = ByteBufferInputStream.of(buffer);
 
         byte[] bytes = new byte[totalLength];