@@ -145,12 +145,12 @@ else if ( commitStage != null )
145
145
}
146
146
else
147
147
{
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 ;
154
154
}
155
155
} );
156
156
}
@@ -173,11 +173,12 @@ else if ( rollbackStage != null )
173
173
}
174
174
else
175
175
{
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 ;
181
182
}
182
183
} );
183
184
}
0 commit comments