wip

Author: injectives

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

@@ -145,12 +145,12 @@ else if ( commitStage != null )
             }
             else
             {
-                CompletionStage<Void> stage = commitStage = resultCursors.retrieveNotConsumedError()
-                                                                         .thenCompose(
-                                                                                 error -> doCommitAsync( error ).handle( handleCommitOrRollback( error ) ) )
-                                                                         .whenComplete( ( ignore, error ) -> releaseConnection( error ) );
-                commitStage.whenComplete( ( ignored, error ) -> updateStateAfterCommitOrRollback( true, error ) );
-                return stage;
+                CompletionStage<Void> partialStage = 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;
             }
         } );
     }
@@ -173,11 +173,12 @@ else if ( rollbackStage != null )
             }
             else
             {
-                CompletionStage<Void> stage = rollbackStage = resultCursors.retrieveNotConsumedError()
-                                                                           .thenCompose( error -> doRollbackAsync().handle( handleCommitOrRollback( error ) ) )
-                                                                           .whenComplete( ( ignore, error ) -> releaseConnection( error ) );
-                rollbackStage.whenComplete( ( ignored, error ) -> updateStateAfterCommitOrRollback( false, error ) );
-                return stage;
+                CompletionStage<Void> partialStage = 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;
             }
         } );
     }