Fixed bitmasking error

For large message sizes whenever the header was split up between packets there
was a bitmasking error that calculated the chunksize wrong.

Author: pontusmelke

driver/src/main/java/org/neo4j/driver/internal/connector/socket/BufferingChunkedInput.java

@@ -88,6 +88,14 @@ public BufferingChunkedInput( ReadableByteChannel channel, int bufferCapacity )
         this.state = State.AWAITING_CHUNK;
     }
 
+    /*
+     * Use only in tests
+     */
+    int remainingChunkSize()
+    {
+        return remainingChunkSize;
+    }
+
     /**
      * Internal state machine used for reading data from the channel into the buffer.
      */
@@ -220,7 +228,7 @@ public State readChunkSize( BufferingChunkedInput ctx ) throws IOException
                         {
                             //Now we have enough space to read the rest of the chunk size
                             byte partialChunkSize = ctx.buffer.get();
-                            ctx.remainingChunkSize = (ctx.remainingChunkSize | partialChunkSize) & 0xFFFF;
+                            ctx.remainingChunkSize = ctx.remainingChunkSize | (partialChunkSize & 0xFF);
                             return IN_CHUNK;
                         }
                         else

driver/src/test/java/org/neo4j/driver/internal/connector/socket/BufferingChunkedInputTest.java

@@ -92,6 +92,25 @@ public void shouldReadOneByteWhenSplitHeader() throws IOException
         assertThat( b2, equalTo( (byte) 37 ) );
     }
 
+    @Test
+    public void shouldReadChunkWithSplitHeaderForBigMessages() throws IOException
+    {
+        // Given
+        int packetSize = 384;
+        BufferingChunkedInput input =
+                new BufferingChunkedInput( packets( packet( 1 ), packet( -128 ), fillPacket( packetSize, 1 ) ) );
+
+        // Then
+        assertThat( input.readByte(), equalTo( (byte) 1 ) );
+        assertThat( input.remainingChunkSize(), equalTo( packetSize - 1 ) );
+
+        for ( int i = 1; i < 384; i++ )
+        {
+            assertThat( input.readByte(), equalTo( (byte) 1 ) );
+        }
+        assertThat( input.remainingChunkSize(), equalTo( 0 ) );
+    }
+
     @Test
     public void shouldReadOneByteInOneChunkWhenBustingBuffer() throws IOException
     {
@@ -415,7 +434,7 @@ public void close() throws IOException
         BufferingChunkedInput input = new BufferingChunkedInput( channel );
 
         // Then
-        assertThat(input.readByte(), equalTo( (byte)11 ));
+        assertThat( input.readByte(), equalTo( (byte) 11 ) );
 
     }
 
@@ -435,6 +454,17 @@ public void shouldFailNicelyOnClosedConnections() throws IOException
         input.readByte();
     }
 
+    private ReadableByteChannel fillPacket( int size, int value )
+    {
+        int[] ints = new int[size];
+        for ( int i = 0; i < size; i++ )
+        {
+            ints[i] = value;
+        }
+
+        return packet( ints );
+    }
+
     private ReadableByteChannel packet( int... bytes )
     {
         byte[] byteArray = new byte[bytes.length];