Merge pull request #190 from ariksher-nex/master

AsciiSequenceView avoid NullPointerException at getBytes
real-logic · Nov 18, 2019 · a3afd46 · a3afd46
2 parents 9d840ff + 81bb36b
commit a3afd46
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/agrona/src/main/java/org/agrona/AsciiSequenceView.java b/agrona/src/main/java/org/agrona/AsciiSequenceView.java
@@ -142,13 +142,17 @@ public void reset()
      */
     public int getBytes(final MutableDirectBuffer dstBuffer, final int dstOffset)
     {
-        dstBuffer.putBytes(dstOffset, this.buffer, offset, length);
+        if (null == buffer || length <= 0)
+        {
+            return 0;
+        }
+        dstBuffer.putBytes(dstOffset, buffer, offset, length);
         return length;
     }
 
     public String toString()
     {
-        if (null == buffer)
+        if (null == buffer || length <= 0)
         {
             return "";
         }

diff --git a/agrona/src/test/java/org/agrona/AsciiSequenceViewTest.java b/agrona/src/test/java/org/agrona/AsciiSequenceViewTest.java
@@ -97,6 +97,7 @@ public void shouldReturnEmptyStringWhenBufferIsNull()
     {
         assertEquals(0, asciiSequenceView.length());
         assertEquals("", asciiSequenceView.toString());
+        assertEquals(0, asciiSequenceView.getBytes(new UnsafeBuffer(new byte[128]), 16));
     }
 
     @Test(expected = StringIndexOutOfBoundsException.class)