[JBPM-10088] Some test failed

kiegroup · Nov 23, 2023 · 5f98688 · 5f98688
1 parent 5e2aed8
commit 5f98688
Show file tree

Hide file tree

Showing 2 changed files with 15 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;
     }
 

diff --git a/...bpm-services-ejb-timer/src/main/java/org/jbpm/services/ejb/timer/EjbSchedulerService.java b/...bpm-services-ejb-timer/src/main/java/org/jbpm/services/ejb/timer/EjbSchedulerService.java
@@ -46,6 +46,7 @@
 import org.jbpm.runtime.manager.impl.SimpleRuntimeEnvironment;
 import org.jbpm.runtime.manager.impl.jpa.EntityManagerFactoryManager;
 import org.jbpm.runtime.manager.impl.jpa.TimerMappingInfo;
+import org.kie.internal.runtime.manager.InternalRuntimeManager;
 import org.kie.internal.runtime.manager.RuntimeEnvironment;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;