Skip to content

Commit 6d17b78

Browse files
committed
wip
1 parent 187cabc commit 6d17b78

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

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

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -145,12 +145,12 @@ else if ( commitStage != null )
145145
}
146146
else
147147
{
148-
CompletionStage<Void> stage = commitStage = resultCursors.retrieveNotConsumedError()
149-
.thenCompose(
150-
error -> doCommitAsync( error ).handle( handleCommitOrRollback( error ) ) )
151-
.whenComplete( ( ignore, error ) -> releaseConnection( error ) );
152-
commitStage.whenComplete( ( ignored, error ) -> updateStateAfterCommitOrRollback( true, error ) );
153-
return stage;
148+
CompletionStage<Void> partialStage = resultCursors
149+
.retrieveNotConsumedError()
150+
.thenCompose( error -> doCommitAsync( error ).handle( handleCommitOrRollback( error ) ) );
151+
CompletionStage<Void> resultStage = commitStage = partialStage.whenComplete( ( ignore, error ) -> releaseConnection( error ) );
152+
partialStage.whenComplete( ( ignored, error ) -> updateStateAfterCommitOrRollback( true, error ) );
153+
return resultStage;
154154
}
155155
} );
156156
}
@@ -173,11 +173,12 @@ else if ( rollbackStage != null )
173173
}
174174
else
175175
{
176-
CompletionStage<Void> stage = rollbackStage = resultCursors.retrieveNotConsumedError()
177-
.thenCompose( error -> doRollbackAsync().handle( handleCommitOrRollback( error ) ) )
178-
.whenComplete( ( ignore, error ) -> releaseConnection( error ) );
179-
rollbackStage.whenComplete( ( ignored, error ) -> updateStateAfterCommitOrRollback( false, error ) );
180-
return stage;
176+
CompletionStage<Void> partialStage = resultCursors
177+
.retrieveNotConsumedError()
178+
.thenCompose( error -> doRollbackAsync().handle( handleCommitOrRollback( error ) ) );
179+
CompletionStage<Void> resultStage = rollbackStage = partialStage.whenComplete( ( ignore, error ) -> releaseConnection( error ) );
180+
partialStage.whenComplete( ( ignored, error ) -> updateStateAfterCommitOrRollback( false, error ) );
181+
return resultStage;
181182
}
182183
} );
183184
}

0 commit comments

Comments
 (0)