wip

Author: injectives

driver/src/main/java/org/neo4j/driver/internal/async/UnmanagedTransaction.java

@@ -145,12 +145,11 @@ else if ( commitStage != null )
             }
             else
             {
-                CompletionStage<Void> partialStage = resultCursors
+                commitStage = resultCursors
                         .retrieveNotConsumedError()
-                        .thenCompose( error -> doCommitAsync( error ).handle( handleCommitOrRollback( error ) ) );
-                CompletionStage<Void> resultStage = commitStage = partialStage.whenComplete( ( ignore, error ) -> releaseConnection( error ) );
-                partialStage.whenComplete( ( ignored, error ) -> updateStateAfterCommitOrRollback( true, error ) );
-                return resultStage;
+                        .thenCompose( error -> doCommitAsync( error ).handle( handleCommitOrRollback( error ) ) )
+                        .whenComplete( ( ignore, error ) -> handleTransactionCompletion( true, error ) );
+                return commitStage;
             }
         } );
     }
@@ -173,12 +172,11 @@ else if ( rollbackStage != null )
             }
             else
             {
-                CompletionStage<Void> partialStage = resultCursors
+                rollbackStage = resultCursors
                         .retrieveNotConsumedError()
-                        .thenCompose( error -> doRollbackAsync().handle( handleCommitOrRollback( error ) ) );
-                CompletionStage<Void> resultStage = rollbackStage = partialStage.whenComplete( ( ignore, error ) -> releaseConnection( error ) );
-                partialStage.whenComplete( ( ignored, error ) -> updateStateAfterCommitOrRollback( false, error ) );
-                return resultStage;
+                        .thenCompose( error -> doRollbackAsync().handle( handleCommitOrRollback( error ) ) )
+                        .whenComplete( ( ignore, error ) -> handleTransactionCompletion( false, error ) );
+                return rollbackStage;
             }
         } );
     }
@@ -294,8 +292,19 @@ private static BiFunction<Void,Throwable,Void> handleCommitOrRollback( Throwable
         };
     }
 
-    private void releaseConnection( Throwable throwable )
+    private void handleTransactionCompletion( boolean commitAttempt, Throwable throwable )
     {
+        executeWithLock( lock, () ->
+        {
+            if ( commitAttempt && throwable == null )
+            {
+                state = State.COMMITTED;
+            }
+            else
+            {
+                state = State.ROLLED_BACK;
+            }
+        } );
         if ( throwable instanceof AuthorizationExpiredException )
         {
             connection.terminateAndRelease( AuthorizationExpiredException.DESCRIPTION );
@@ -309,27 +318,4 @@ else if ( throwable instanceof ConnectionReadTimeoutException )
             connection.release(); // release in background
         }
     }
-
-    private void updateStateAfterCommitOrRollback( boolean commitAttempt, Throwable throwable )
-    {
-        executeWithLock( lock, () ->
-        {
-            if ( commitAttempt && throwable == null )
-            {
-                state = State.COMMITTED;
-            }
-            else
-            {
-                state = State.ROLLED_BACK;
-            }
-            if ( commitAttempt )
-            {
-                commitStage = null;
-            }
-            else
-            {
-                rollbackStage = null;
-            }
-        } );
-    }
 }