Merge pull request #6118 from pontusmelke/3.0-socket-avoid-deadlock

Don't block read when reading is done

community/bolt/src/test/java/org/neo4j/bolt/v1/transport/socket/client/SocketConnection.java

@@ -71,7 +71,7 @@ public byte[] recv( int length ) throws IOException, InterruptedException
 
         try
         {
-            while ( (read = in.read( bytes, length - left, left )) != -1 && left > 0 )
+            while ( left > 0 && (read = in.read( bytes, length - left, left )) != -1 )
             {
                 left -= read;
             }

community/bolt/src/test/java/org/neo4j/bolt/v1/transport/socket/client/SocketConnectionTest.java

@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2002-2015 "Neo Technology,"
+ * Network Engine for Objects in Lund AB [http://neotechnology.com]
+ *
+ * This file is part of Neo4j.
+ *
+ * Neo4j is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.neo4j.bolt.v1.transport.socket.client;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.Socket;
+
+import org.neo4j.helpers.HostnamePort;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+
+public class SocketConnectionTest
+{
+
+    @Rule
+    public ExpectedException expectedException = ExpectedException.none();
+
+    @Test
+    public void shouldOnlyReadOnceIfAllBytesAreRead() throws Exception
+    {
+        // GIVEN
+        Socket socket = mock( Socket.class );
+        InputStream stream = mock( InputStream.class );
+        when(socket.getInputStream()).thenReturn( stream );
+        when(stream.read( any(byte[].class), anyInt(), anyInt() )).thenReturn( 4 );
+        SocketConnection connection = new SocketConnection( socket );
+        connection.connect( new HostnamePort( "my.domain", 1234 ) );
+
+        // WHEN
+        connection.recv( 4 );
+
+        // THEN
+        verify(stream, times(1)).read(  any(byte[].class), anyInt(), anyInt() );
+    }
+
+    @Test
+    public void shouldOnlyReadUntilAllBytesAreRead() throws Exception
+    {
+        // GIVEN
+        Socket socket = mock( Socket.class );
+        InputStream stream = mock( InputStream.class );
+        when(socket.getInputStream()).thenReturn( stream );
+        when(stream.read( any(byte[].class), anyInt(), anyInt() ))
+                .thenReturn( 4 )
+                .thenReturn( 4 )
+                .thenReturn( 2 )
+                .thenReturn( -1 );
+        SocketConnection connection = new SocketConnection( socket );
+        connection.connect( new HostnamePort( "my.domain", 1234 ) );
+
+        // WHEN
+        connection.recv( 10 );
+
+        // THEN
+        verify(stream, times(3)).read(  any(byte[].class), anyInt(), anyInt() );
+    }
+
+    @Test
+    public void shouldThrowIfNotEnoughBytesAreRead() throws Exception
+    {
+        // GIVEN
+        Socket socket = mock( Socket.class );
+        InputStream stream = mock( InputStream.class );
+        when(socket.getInputStream()).thenReturn( stream );
+        when(stream.read( any(byte[].class), anyInt(), anyInt() ))
+                .thenReturn( 4 )
+                .thenReturn( -1 );
+        SocketConnection connection = new SocketConnection( socket );
+        connection.connect( new HostnamePort( "my.domain", 1234 ) );
+
+        // EXPECT
+        expectedException.expect( IOException.class );
+
+        // WHEN
+        connection.recv( 10 );
+    }
+}