Merge pull request #243 from mneedham/client-exception-on-close

Catch & translate NotALeader exception when session is closed

Author: pontusmelke

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

@@ -72,6 +72,10 @@ public void close()
         {
             throw sessionExpired(e, onError, connection.address());
         }
+        catch ( ClientException e )
+        {
+            throw filterFailureToWrite( e, mode, onError, connection.address() );
+        }
     }
 
     public BoltServerAddress address()

driver/src/test/java/org/neo4j/driver/internal/RoutingNetworkSessionTest.java

@@ -186,4 +186,29 @@ public void shouldHandleConnectionFailuresOnClose()
         verify( onError ).onConnectionFailure( LOCALHOST );
         verifyNoMoreInteractions( onError );
     }
+
+    @Test
+    public void shouldHandleWriteFailuresOnClose()
+    {
+        // Given
+        doThrow( new ClientException( "Neo.ClientError.Cluster.NotALeader", "oh no!" ) ).when( connection ).sync();
+
+        RoutingNetworkSession session =
+                new RoutingNetworkSession( AccessMode.WRITE, connection, onError );
+
+        // When
+        try
+        {
+            session.close();
+            fail();
+        }
+        catch ( SessionExpiredException e )
+        {
+            //ignore
+        }
+
+        // Then
+        verify( onError ).onWriteFailure( LOCALHOST );
+        verifyNoMoreInteractions( onError );
+    }
 }