Switch to ConnectionFailureException

neo4j · Oct 6, 2016 · 614cf13 · 614cf13
1 parent cdc79ca
commit 614cf13
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/driver/src/main/java/org/neo4j/driver/internal/NetworkSession.java b/driver/src/main/java/org/neo4j/driver/internal/NetworkSession.java
@@ -34,6 +34,7 @@
 import org.neo4j.driver.v1.Value;
 import org.neo4j.driver.v1.Values;
 import org.neo4j.driver.v1.exceptions.ClientException;
+import org.neo4j.driver.v1.exceptions.ConnectionFailureException;
 import org.neo4j.driver.v1.types.TypeSystem;
 
 import static org.neo4j.driver.v1.Values.value;
@@ -296,9 +297,9 @@ private void ensureConnectionIsOpen()
     {
         if ( !connection.isOpen() )
         {
-            throw new ClientException( "The current session cannot be reused as the underlying connection with the " +
-                                       "server has been closed due to unrecoverable errors. " +
-                                       "Please close this session and retry your statement in another new session." );
+            throw new ConnectionFailureException( "The current session cannot be reused as the underlying connection with the " +
+                                                  "server has been closed due to unrecoverable errors. " +
+                                                  "Please close this session and retry your statement in another new session." );
         }
     }
 

diff --git a/driver/src/test/java/org/neo4j/driver/internal/NetworkSessionTest.java b/driver/src/test/java/org/neo4j/driver/internal/NetworkSessionTest.java
@@ -27,6 +27,7 @@
 import org.neo4j.driver.v1.Logger;
 import org.neo4j.driver.v1.Transaction;
 import org.neo4j.driver.v1.exceptions.ClientException;
+import org.neo4j.driver.v1.exceptions.ConnectionFailureException;
 
 import static junit.framework.Assert.fail;
 import static junit.framework.TestCase.assertNotNull;
@@ -121,7 +122,7 @@ public void shouldNotAllowMoreStatementsInSessionWhileConnectionClosed() throws
         when( mock.isOpen() ).thenReturn( false );
 
         // Expect
-        exception.expect( ClientException.class );
+        exception.expect( ConnectionFailureException.class );
 
         // When
         sess.run( "whatever" );
@@ -134,7 +135,7 @@ public void shouldNotAllowMoreTransactionsInSessionWhileConnectionClosed() throw
         when( mock.isOpen() ).thenReturn( false );
 
         // Expect
-        exception.expect( ClientException.class );
+        exception.expect( ConnectionFailureException.class );
 
         // When
         sess.beginTransaction();