[JBPM-10088] Some test failed

kiegroup · Nov 23, 2023 · 3bba9a7 · 3bba9a7
1 parent 5e2aed8
commit 3bba9a7
Showing 1 changed file with 14 additions and 9 deletions.
diff --git a/...m-persistence-jpa/src/main/java/org/jbpm/persistence/timer/GlobalJpaTimerJobInstance.java b/...m-persistence-jpa/src/main/java/org/jbpm/persistence/timer/GlobalJpaTimerJobInstance.java
@@ -159,18 +159,23 @@ protected boolean hasEnvironmentEntry(Environment environment, String name, Obje
  }
 
  protected TransactionManager startTxIfNeeded(Environment environment) {
- try { 
- boolean isTimerCMT = hasEnvironmentEntry(environment, "IS_TIMER_CMT", true);
- logger.debug ("Timer CMT value is {}", isTimerCMT);
- if (!isTimerCMT) {
- TransactionManager tm = TransactionManagerFactory.get().newTransactionManager();
- if (tm.begin()) {
- return tm;
- }
- }
+
+ try { 
+ if (hasEnvironmentEntry(environment, "IS_TIMER_CMT", true)) {
+ return null;
+ }
+ if (environment.get(EnvironmentName.TRANSACTION_MANAGER) instanceof ContainerManagedTransactionManager) {
+ TransactionManager tm = TransactionManagerFactory.get().newTransactionManager();
+
+ if (tm.begin()) { 
+ return tm;
+ }
+ }
+
  } catch (Exception e) {
  logger.debug("Unable to optionally start transaction due to {}", e.getMessage(), e);
  }
+
  return null;
  }