DROOLS-733 - unification of execution servers - allow to use jms/ejb …

…timers and executors in all supported containers
kiegroup · Aug 28, 2015 · 47ed295 · 47ed295
1 parent eaf0670
commit 47ed295
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 24 deletions.
diff --git a/jbpm-services/jbpm-executor/src/main/java/org/jbpm/executor/impl/ExecutorImpl.java b/jbpm-services/jbpm-executor/src/main/java/org/jbpm/executor/impl/ExecutorImpl.java
@@ -87,6 +87,7 @@ public class ExecutorImpl implements Executor {
     private boolean useJMS = Boolean.parseBoolean(System.getProperty("org.kie.executor.jms", "true"));
     private String connectionFactoryName = System.getProperty("org.kie.executor.jms.cf", "java:/JmsXA");
     private String queueName = System.getProperty("org.kie.executor.jms.queue", "queue/KIE.EXECUTOR");
+    private boolean transacted = Boolean.parseBoolean(System.getProperty("org.kie.executor.jms.transacted", "false"));
     private ConnectionFactory connectionFactory;
     private Queue queue;
 
@@ -375,10 +376,13 @@ protected void sendMessage(String messageBody) {
         MessageProducer producer = null;
         try {
             queueConnection = connectionFactory.createConnection();
-            queueSession = queueConnection.createSession(true, Session.AUTO_ACKNOWLEDGE);
+            queueSession = queueConnection.createSession(transacted, Session.AUTO_ACKNOWLEDGE);
 
             TextMessage message = queueSession.createTextMessage(messageBody);
-            producer = queueSession.createProducer(queue);            
+            producer = queueSession.createProducer(queue);   
+
+            queueConnection.start();
+
             producer.send(message);
         } catch (Exception e) {
             throw new RuntimeException("Error when sending JMS message with executor job request", e);

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
@@ -33,7 +33,6 @@
 import org.drools.core.time.JobHandle;
 import org.drools.core.time.impl.TimerJobInstance;
 import org.jbpm.process.core.timer.TimerServiceRegistry;
-import org.jbpm.process.core.timer.impl.GlobalTimerService.GlobalJobHandle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -94,25 +93,6 @@ public void internalSchedule(TimerJobInstance timerJobInstance) {
 		}
 	}
 
-	public boolean isValid(GlobalJobHandle jobHandle) {
-		EjbGlobalJobHandle ejbHandle = (EjbGlobalJobHandle) jobHandle;
-
-		for (Timer timer : timerService.getTimers()) {
-			Serializable info = timer.getInfo();
-			if (info instanceof EjbTimerJob) {
-				EjbTimerJob job = (EjbTimerJob) info;
-
-				EjbGlobalJobHandle handle = (EjbGlobalJobHandle) job.getTimerJobInstance().getJobHandle();
-				if (handle.getUuid().equals(ejbHandle.getUuid())) {
-					logger.debug("Job handle {} does match timer", jobHandle);
-					return true;
-				}
-			}
-		}
-		logger.debug("Job handle {} is not valid on {} scheduler service", jobHandle, this);
-		return false;
-	}
-
 	public boolean removeJob(JobHandle jobHandle) {
 		EjbGlobalJobHandle ejbHandle = (EjbGlobalJobHandle) jobHandle;
 
@@ -124,7 +104,12 @@ public boolean removeJob(JobHandle jobHandle) {
 				EjbGlobalJobHandle handle = (EjbGlobalJobHandle) job.getTimerJobInstance().getJobHandle();
 				if (handle.getUuid().equals(ejbHandle.getUuid())) {
 					logger.debug("Job handle {} does match timer and is going to be canceled", jobHandle);
-					timer.cancel();
+					try {
+					    timer.cancel();
+					} catch (Throwable e) {
+					    logger.debug("Timer cancel error due to {}", e.getMessage());
+					    return false;
+					}
 					return true;
 				}
 			}

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
@@ -120,7 +120,8 @@ public void setInterceptor(SchedulerServiceInterceptor interceptor) {
 
 	@Override
 	public boolean isValid(GlobalJobHandle jobHandle) {
-		return scheduler.isValid(jobHandle);
+
+        return true;	    
 	}
 
 	private String getJobName(JobContext ctx, Long id) {