[JBPM-10088] REmoving new transaction created while querying during

rollback
kiegroup · Nov 22, 2023 · ab096b6 · ab096b6
1 parent 7dda523
commit ab096b6
Showing 1 changed file with 5 additions and 18 deletions.
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
@@ -144,30 +144,17 @@ private TimerMappingInfo getTimerMappinInfo(long processInstanceId, long timerId
     }
 
     private TimerMappingInfo getTimerMappingInfo(Function<EntityManager, List<TimerMappingInfo>> func) {
-        InternalRuntimeManager manager = ((GlobalTimerService) globalTimerService).getRuntimeManager();
-        String pu = ((InternalRuntimeManager) manager).getDeploymentDescriptor().getPersistenceUnit();
-        EntityManagerFactory emf = EntityManagerFactoryManager.get().getOrCreate(pu);
-        EntityManager em = emf.createEntityManager();
-        JtaTransactionManager tm = (JtaTransactionManager) TransactionManagerFactory.get().newTransactionManager();
-        boolean txOwner = false;
+        EntityManager em = EntityManagerFactoryManager.get()
+                .getOrCreate(((InternalRuntimeManager) ((GlobalTimerService) globalTimerService).getRuntimeManager())
+                        .getDeploymentDescriptor().getPersistenceUnit())
+                .createEntityManager();
         try {
-            if (tm != null  && tm.getStatus() == TransactionManager.STATUS_ROLLEDBACK) {
-                txOwner = tm.begin();
-            }
             List<TimerMappingInfo> info = func.apply(em);
-            if (!info.isEmpty()) {
-                return info.get(0);
-            } else {
-                return null;
-            }
-
+            return !info.isEmpty() ? info.get(0) : null;
         } catch (Exception ex) {
             logger.warn("Error getting mapping info ",ex);
             return null;
         } finally {
-            if (tm != null) {
-                tm.commit(txOwner);
-            }
             em.close();
         }
     }