Fix the failing test

Author: Zhen

driver/src/main/java/org/neo4j/driver/internal/security/TLSSocketChannel.java

@@ -181,8 +181,7 @@ void channelRead( ByteBuffer toBuffer ) throws IOException
      */
     void channelWrite( ByteBuffer fromBuffer ) throws IOException
     {
-        int written = channel.write( fromBuffer );
-        if (written <= 0)
+        if ( channel.write( fromBuffer ) < 0 )
         {
             try
             {
@@ -327,7 +326,7 @@ private HandshakeStatus wrap( ByteBuffer buffer ) throws IOException
             cipherOut.flip();
             while ( cipherOut.hasRemaining() )
             {
-                channel.write( cipherOut );
+                channelWrite( cipherOut );
             }
             cipherOut.clear();
             break;
@@ -455,12 +454,7 @@ public void close() throws IOException
                 cipherOut.flip();
                 while ( cipherOut.hasRemaining() )
                 {
-                    int num = channel.write( cipherOut );
-                    if ( num == -1 )
-                    {
-                        // handle closed channel
-                        break;
-                    }
+                    channelWrite( cipherOut );
                 }
                 cipherOut.clear();
             }

driver/src/test/java/org/neo4j/driver/internal/security/TLSSocketChannelTest.java

@@ -26,7 +26,6 @@
 import javax.net.ssl.SSLHandshakeException;
 import javax.net.ssl.SSLSession;
 
-import org.neo4j.driver.internal.logging.DevNullLogger;
 import org.neo4j.driver.v1.exceptions.ClientException;
 import org.neo4j.driver.v1.exceptions.ServiceUnavailableException;
 
@@ -40,6 +39,7 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
+import static org.neo4j.driver.internal.logging.DevNullLogger.DEV_NULL_LOGGER;
 import static org.neo4j.driver.internal.security.TLSSocketChannel.create;
 
 public class TLSSocketChannelTest
@@ -59,7 +59,7 @@ public void shouldCloseConnectionIfFailedToRead() throws Throwable
         when( mockedSslSession.getPacketBufferSize() ).thenReturn( 10 );
 
         // When
-        TLSSocketChannel channel = new TLSSocketChannel( mockedChannel, new DevNullLogger(), mockedSslEngine );
+        TLSSocketChannel channel = new TLSSocketChannel( mockedChannel, DEV_NULL_LOGGER, mockedSslEngine );
 
         try
         {
@@ -89,7 +89,7 @@ public void shouldCloseConnectionIfFailedToWrite() throws Throwable
         when( mockedSslSession.getPacketBufferSize() ).thenReturn( 10 );
 
         // When
-        TLSSocketChannel channel = new TLSSocketChannel( mockedChannel, new DevNullLogger(), mockedSslEngine );
+        TLSSocketChannel channel = new TLSSocketChannel( mockedChannel, DEV_NULL_LOGGER, mockedSslEngine );
 
         try
         {
@@ -123,7 +123,7 @@ public void shouldThrowClientErrorIfFailedToHandshake() throws Throwable
         // When & Then
         try
         {
-            create( mockedChannel, new DevNullLogger(), mockedSslEngine );
+            create( mockedChannel, DEV_NULL_LOGGER, mockedSslEngine );
             fail( "Should fail to run handshake" );
         }
         catch( Exception e )