Skip to content

Commit 29e9474

Browse files
committed
#80 fix for spring 6.1
1 parent 592a0bb commit 29e9474

File tree

1 file changed

+6
-14
lines changed

1 file changed

+6
-14
lines changed

src/main/java/com/arangodb/springframework/transaction/ArangoTransactionManager.java

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -190,27 +190,19 @@ protected void doSetRollbackOnly(DefaultTransactionStatus status) throws Transac
190190

191191
/**
192192
* Any transaction object is configured according to the definition upfront.
193-
*
194-
* @see ArangoTransactionObject#configure(TransactionDefinition)
195-
*/
196-
@Override
197-
protected DefaultTransactionStatus newTransactionStatus(TransactionDefinition definition, @Nullable Object transaction, boolean newTransaction, boolean newSynchronization, boolean debug, @Nullable Object suspendedResources) {
198-
if (transaction instanceof ArangoTransactionObject) {
199-
((ArangoTransactionObject) transaction).configure(definition);
200-
}
201-
return super.newTransactionStatus(definition, transaction, newTransaction, newSynchronization, debug, suspendedResources);
202-
}
203-
204-
/**
205193
* Bind the holder for the first new transaction created.
206194
*
207195
* @see ArangoTransactionHolder
208196
*/
209197
@Override
210198
protected void prepareSynchronization(DefaultTransactionStatus status, TransactionDefinition definition) {
199+
ArangoTransactionObject transaction = status.hasTransaction() ? (ArangoTransactionObject) status.getTransaction() : null;
200+
if (transaction != null) {
201+
transaction.configure(definition);
202+
}
211203
super.prepareSynchronization(status, definition);
212-
if (status.isNewSynchronization()) {
213-
ArangoTransactionHolder holder = ((ArangoTransactionObject) status.getTransaction()).getHolder();
204+
if (transaction != null && status.isNewSynchronization()) {
205+
ArangoTransactionHolder holder = transaction.getHolder();
214206
TransactionSynchronizationManager.bindResource(this, holder);
215207
}
216208
}

0 commit comments

Comments
 (0)