Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[7.67.x-blue] [JBPM-10245] Make sure that thread is clean when commit/rollback #3074

Open
wants to merge 1 commit into
base: 7.67.x-blue
Choose a base branch
from
+26 −24
Open

[7.67.x-blue] [JBPM-10245] Make sure that thread is clean when commit/rollback #3074

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 26 additions & 24 deletions kie-spring/src/main/java/org/kie/spring/persistence/KieSpringTransactionManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public class KieSpringTransactionManager
private AbstractPlatformTransactionManager ptm;

TransactionDefinition td = new DefaultTransactionDefinition();
TransactionStatus currentTransaction = null;
ThreadLocal<TransactionStatus> currentTransaction = new ThreadLocal<>();

public KieSpringTransactionManager(AbstractPlatformTransactionManager ptm) {
this.ptm = ptm;
Expand All @@ -50,14 +50,14 @@ public boolean begin() {
// RHBPMS-4621 - transaction can be marked as rollback
// and still be associated with current thread
// See WFLY-4327
if ( getStatus() == TransactionManager.STATUS_ROLLEDBACK ) {
logger.debug("Cleanup of transaction that has been rolled back previously");
if (getStatus() == TransactionManager.STATUS_ROLLEDBACK) {
logger.warn("Cleaning up rolledback transaction");
rollback(true);
}
if (getStatus() == TransactionManager.STATUS_NO_TRANSACTION) {
// If there is no transaction then start one, we will commit within the same Command
// it seems in spring calling getTransaction is enough to begin a new transaction
currentTransaction = this.ptm.getTransaction(td);
currentTransaction.set(this.ptm.getTransaction(td));
return true;
} else {
return false;
Expand All @@ -81,37 +81,39 @@ public void commit(boolean transactionOwner) {

try {
// if we didn't begin this transaction, then do nothing
this.ptm.commit(currentTransaction);
currentTransaction = null;
if (TransactionSynchronizationManager.hasResource(KieSpringTransactionManager.RESOURCE_CONTAINER)) {
TransactionSynchronizationManager.unbindResource(KieSpringTransactionManager.RESOURCE_CONTAINER);
}
this.ptm.commit(currentTransaction.get());
} catch (Exception e) {
logger.warn("Unable to commit transaction",
e);
throw new RuntimeException("Unable to commit transaction",
e);
} finally {
cleanupTransaction();
}

}

public void rollback(boolean transactionOwner) {
try {
if (transactionOwner) {
this.ptm.rollback(currentTransaction);
currentTransaction = null;
if (TransactionSynchronizationManager.hasResource(KieSpringTransactionManager.RESOURCE_CONTAINER)) {
TransactionSynchronizationManager.unbindResource(KieSpringTransactionManager.RESOURCE_CONTAINER);
}
if (transactionOwner) {
try {
this.ptm.rollback(currentTransaction.get());
} catch (Exception e) {
logger.warn("Unable to rollback transaction", e);
throw new RuntimeException("Unable to rollback transaction", e);
} finally {
cleanupTransaction();
}
} catch (Exception e) {
logger.warn("Unable to rollback transaction",
e);
throw new RuntimeException("Unable to rollback transaction",
e);
}
}

private void cleanupTransaction() {
if (TransactionSynchronizationManager.hasResource(KieSpringTransactionManager.RESOURCE_CONTAINER)) {
TransactionSynchronizationManager.unbindResource(KieSpringTransactionManager.RESOURCE_CONTAINER);
}
TransactionSynchronizationManager.clear();
currentTransaction.remove();
}

/**
* Borrowed from Seam
*/
Expand All @@ -124,13 +126,13 @@ public int getStatus() {
if (TransactionSynchronizationManager.isActualTransactionActive()) {
TransactionStatus transaction = null;
try {
if (currentTransaction == null) {
if (currentTransaction.get() == null) {
transaction = ptm.getTransaction(td);
if (transaction.isNewTransaction()) {
return TransactionManager.STATUS_COMMITTED;
}
} else {
transaction = currentTransaction;
transaction = currentTransaction.get();
}
logger.debug("Current TX: " + transaction);
// If SynchronizationManager thinks it has an active transaction but
Expand All @@ -152,7 +154,7 @@ public int getStatus() {
return TransactionManager.STATUS_ACTIVE;
}
} finally {
if (currentTransaction == null && transaction != null) {
if (currentTransaction.get() == null && transaction != null) {
ptm.commit(transaction);
}
}
Expand Down