Allow more statements and tx after reset

Author: Zhen Li

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

@@ -59,7 +59,6 @@ public void run()
 
     private ExplicitTransaction currentTransaction;
     private AtomicBoolean isOpen = new AtomicBoolean( true );
-    private boolean markedToClose;
 
     NetworkSession( Connection connection, Logger logger )
     {
@@ -94,7 +93,7 @@ public StatementResult run( String statementText, Value statementParameters )
     }
 
     @Override
-    public synchronized StatementResult run( Statement statement )
+    public StatementResult run( Statement statement )
     {
         ensureConnectionIsValidBeforeRunningSession();
         InternalStatementResult cursor = new InternalStatementResult( connection, null, statement );
@@ -104,23 +103,19 @@ public synchronized StatementResult run( Statement statement )
         return cursor;
     }
 
-    public synchronized void reset()
+    public void reset()
     {
         ensureSessionIsOpen();
         ensureNoUnrecoverableError();
         ensureConnectionIsOpen();
 
-        if( !markedToClose )
-        {
-            markedToClose = true;
-            connection.resetAsync();
-        }
+        connection.resetAsync();
     }
 
     @Override
     public boolean isOpen()
     {
-        return isOpen.get() && !markedToClose;
+        return isOpen.get();
     }
 
     @Override
@@ -168,7 +163,7 @@ public Transaction beginTransaction()
     }
 
     @Override
-    public synchronized Transaction beginTransaction( String bookmark )
+    public Transaction beginTransaction( String bookmark )
     {
         ensureConnectionIsValidBeforeOpeningTransaction();
         currentTransaction = new ExplicitTransaction( connection, txCleanup, bookmark );

driver/src/test/java/org/neo4j/driver/v1/integration/SessionIT.java

@@ -27,7 +27,6 @@
 import org.neo4j.driver.v1.util.TestNeo4j;
 
 import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.startsWith;
 import static org.hamcrest.Matchers.greaterThan;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertThat;
@@ -122,7 +121,6 @@ public void shouldKillLongRunningStatement() throws Throwable
             assertTrue( startTime > 0 );
             assertTrue( endTime - startTime > killTimeout * 1000 ); // get reset by session.reset
             assertTrue( endTime - startTime < executionTimeout * 1000 / 2 ); // finished before execution finished
-            assertFalse( session.isOpen() );
         }
         catch ( Exception e )
         {
@@ -199,32 +197,25 @@ public void run()
     }
 
     @Test
-    public void shouldNotAllowMoreStatementAfterSessionReset()
+    public void shouldAllowMoreStatementAfterSessionReset()
     {
         // Given
         try( Driver driver =  GraphDatabase.driver( neo4j.uri() );
              Session session = driver.session() )
         {
 
-            session.run( "Return 1" );
+            session.run( "Return 1" ).consume();
+
+            // When reset the state of this session
             session.reset();
 
-            // When & Then
-            try
-            {
-                session.run( "Return 2" );
-                fail( "Should disallow more statements" );
-            }
-            catch( Exception e )
-            {
-                assertThat( e.getMessage(), startsWith("No more interaction with this session is allowed " +
-                        "as the current session is already closed or marked as closed.") );
-            }
+            // Then can run successfully more statements without any error
+            session.run( "Return 2" ).consume();
         }
     }
 
     @Test
-    public void shouldNotAllowMoreTxAfterSessionReset()
+    public void shouldAllowMoreTxAfterSessionReset()
     {
         // Given
         try( Driver driver =  GraphDatabase.driver( neo4j.uri() );
@@ -235,18 +226,15 @@ public void shouldNotAllowMoreTxAfterSessionReset()
                 tx.run("Return 1");
                 tx.success();
             }
+
+            // When reset the state of this session
             session.reset();
 
-            // When & Then
-            try
-            {
-                session.beginTransaction();
-                fail( "Should disallow more statements" );
-            }
-            catch( Exception e )
+            // Then can run more Tx
+            try( Transaction tx = session.beginTransaction() )
             {
-                assertThat( e.getMessage(), startsWith("No more interaction with this session is allowed " +
-                        "as the current session is already closed or marked as closed.") );
+                tx.run("Return 2");
+                tx.success();
             }
         }
     }