Revert "[JBPM-10088] Set to no transactional"

This reverts commit 61b735b.
kiegroup · Nov 22, 2023 · 6c364e7 · 6c364e7
1 parent 61b735b
commit 6c364e7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/.../jbpm-services-ejb-timer/src/main/java/org/jbpm/services/ejb/timer/EJBTimerScheduler.java b/.../jbpm-services-ejb-timer/src/main/java/org/jbpm/services/ejb/timer/EJBTimerScheduler.java
@@ -191,7 +191,11 @@ public <I> void transaction(Transaction<I> operation, I item) throws Exception {
         try {
             operation.doWork(item);
         } catch (Exception transactionEx) {
-            ctx.setRollbackOnly();
+            try {
+                ctx.setRollbackOnly();
+            } catch (Exception rollbackEx) {
+                logger.info("Exception occurs when setting rollback only {}", rollbackEx.getMessage());
+            }
             throw transactionEx;
         }
     }

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
@@ -57,6 +57,8 @@
 public class EjbSchedulerService implements GlobalSchedulerService {
     private static final Logger logger = LoggerFactory.getLogger(EjbSchedulerService.class);
 
+    private static final Boolean TRANSACTIONAL = Boolean.parseBoolean(System.getProperty("org.jbpm.ejb.timer.tx", "true"));
+
 	private AtomicLong idCounter = new AtomicLong();
 	private TimerService globalTimerService;
 	private EJBTimerScheduler scheduler;
@@ -216,7 +218,7 @@ public JobHandle buildJobHandleForContext(NamedJobContext ctx) {
 
 	@Override
 	public boolean isTransactional() {
-		return false;
+		return TRANSACTIONAL;
 	}
 
 	@Override