Fixed expect strust but get xx bug by flipping a buffer back after connection error

Close the socket channel directly if server already mark the end of the channel

Author: Zhen

driver/src/main/java/org/neo4j/driver/internal/InternalSession.java

@@ -108,32 +108,38 @@ public boolean isOpen()
     public void close()
     {
         // Use atomic operation to protect from closing the connection twice (putting back to the pool twice).
-        if( !isOpen.compareAndSet( true, false ) )
+        if ( !isOpen.compareAndSet( true, false ) )
         {
             throw new ClientException( "This session has already been closed." );
         }
-        else
+
+        if( !connection.isOpen() )
+        {
+            // the socket connection is already closed due to some error, cannot send more data
+            connection.close();
+            return;
+        }
+
+        if ( currentTransaction != null )
         {
-            if ( currentTransaction != null )
-            {
-                try
-                {
-                    currentTransaction.close();
-                }
-                catch ( Throwable e )
-                {
-                    // Best-effort
-                }
-            }
             try
             {
-                connection.sync();
+                currentTransaction.close();
             }
-            finally
+            catch ( Throwable e )
             {
-                connection.close();
+                // Best-effort
             }
         }
+        try
+        {
+            connection.sync();
+        }
+        finally
+        {
+            connection.close();
+        }
+
     }
 
     @Override

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

@@ -408,11 +408,18 @@ private static void readNextPacket( ReadableByteChannel channel, ByteBuffer buff
             int read = channel.read( buffer );
             if ( read == -1 )
             {
+                try
+                {
+                    channel.close();
+                }
+                catch ( IOException e )
+                {
+                    // best effort
+                }
                 throw new ClientException(
                         "Connection terminated while receiving data. This can happen due to network " +
                         "instabilities, or due to restarts of the database." );
             }
-            buffer.flip();
         }
         catch ( ClosedByInterruptException e )
         {
@@ -429,6 +436,10 @@ private static void readNextPacket( ReadableByteChannel channel, ByteBuffer buff
             throw new ClientException(
                     "Unable to process request: " + message + " buffer: \n" + BytePrinter.hex( buffer ), e );
         }
+        finally
+        {
+            buffer.flip();
+        }
     }
 
     /**

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

@@ -41,6 +41,14 @@ public static void blockingRead(ByteChannel channel, ByteBuffer buf) throws IOEx
         {
             if (channel.read( buf ) < 0)
             {
+                try
+                {
+                    channel.close();
+                }
+                catch ( IOException e )
+                {
+                    // best effort
+                }
                 String bufStr = BytePrinter.hex( buf ).trim();
                 throw new ClientException( String.format(
                         "Connection terminated while receiving data. This can happen due to network " +
@@ -56,6 +64,14 @@ public static void blockingWrite(ByteChannel channel, ByteBuffer buf) throws IOE
         {
             if (channel.write( buf ) < 0)
             {
+                try
+                {
+                    channel.close();
+                }
+                catch ( IOException e )
+                {
+                    // best effort
+                }
                 String bufStr = BytePrinter.hex( buf ).trim();
                 throw new ClientException( String.format(
                         "Connection terminated while sending data. This can happen due to network " +