don't fail on ROLLBACK when in AUTO-COMMIT mode

neo4j · Nov 9, 2017 · 34a14b9 · 34a14b9
1 parent d13fa50
commit 34a14b9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/TransactionStateMachine.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/TransactionStateMachine.java
@@ -208,8 +208,8 @@ else if ( statement.equalsIgnoreCase( COMMIT ) )
                         }
                         else if ( statement.equalsIgnoreCase( ROLLBACK ) )
                         {
-                            throw new QueryExecutionKernelException(
+                            ctx.currentResult = BoltResult.EMPTY;
-                                    new InvalidSemanticsException( "No current transaction to rollback." ) );
+                            return AUTO_COMMIT;
                         }
                         else
                         {

diff --git a/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/integration/TransactionIT.java b/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/integration/TransactionIT.java
@@ -121,7 +121,7 @@ public void shouldHandleBeginRollback() throws Throwable
     }
 
     @Test
-    public void shouldFailNicelyWhenOutOfOrderRollback() throws Throwable
+    public void shouldNotFailWhenOutOfOrderRollbackInAutoCommitMode() throws Throwable
     {
         // Given
         BoltResponseRecorder runRecorder = new BoltResponseRecorder();
@@ -134,8 +134,8 @@ public void shouldFailNicelyWhenOutOfOrderRollback() throws Throwable
         machine.pullAll( pullAllRecorder );
 
         // Then
-        assertThat( runRecorder.nextResponse(), failedWithStatus( Status.Statement.SemanticError ) );
+        assertThat( runRecorder.nextResponse(), succeeded() );
-        assertThat( pullAllRecorder.nextResponse(), wasIgnored() );
+        assertThat( pullAllRecorder.nextResponse(), succeeded() );
     }
 
     @Test