[jboss-svn-commits] JBL Code SVN: r34723 - labs/jbossrules/branches/5_1_20100802_esteban_diega/drools-process/drools-persistent-timer/drools-timer-scheduler/src/main/java/org/drools/timer/scheduler.

[jboss-svn-commits at lists.jboss.org]

Author: diegoll
Date: 2010-08-14 19:10:57 -0400 (Sat, 14 Aug 2010)
New Revision: 34723

Modified:
   labs/jbossrules/branches/5_1_20100802_esteban_diega/drools-process/drools-persistent-timer/drools-timer-scheduler/src/main/java/org/drools/timer/scheduler/TimerScheduler.java
Log:
[JBRULES-2616] removed awful hack

Modified: labs/jbossrules/branches/5_1_20100802_esteban_diega/drools-process/drools-persistent-timer/drools-timer-scheduler/src/main/java/org/drools/timer/scheduler/TimerScheduler.java
===================================================================
--- labs/jbossrules/branches/5_1_20100802_esteban_diega/drools-process/drools-persistent-timer/drools-timer-scheduler/src/main/java/org/drools/timer/scheduler/TimerScheduler.java	2010-08-14 23:09:09 UTC (rev 34722)
+++ labs/jbossrules/branches/5_1_20100802_esteban_diega/drools-process/drools-persistent-timer/drools-timer-scheduler/src/main/java/org/drools/timer/scheduler/TimerScheduler.java	2010-08-14 23:10:57 UTC (rev 34723)
@@ -29,8 +29,7 @@
 	private ClientSession session;
 
 	private void process(InsertScheduledTimerMessage message) {
-	    try{ Thread.sleep(3000); } catch(Exception d) {};
-		JobDetail job = new JobDetail(message.getProcessInstanceId().toString(), Scheduler.DEFAULT_GROUP, TimerExecutorJob.class);
+		JobDetail job = new JobDetail(String.valueOf(message.getProcessInstanceId()), Scheduler.DEFAULT_GROUP, TimerExecutorJob.class);
 		
 		job.getJobDataMap().put(TimerExecutorJob.PROCESS_INSTANCE_ID, message.getProcessInstanceId());
 		job.getJobDataMap().put(TimerExecutorJob.ENV, message.getEnvironmentBeanName());
@@ -42,6 +41,8 @@
 		
 		job.getJobDataMap().put(TimerExecutorJob.TIMER_EXECUTOR_CONNECTOR, timerExecutorConnector);
 		job.getJobDataMap().put(TimerExecutorJob.TIMER_EXECUTOR_SESSION, session);
+		job.getJobDataMap().put(TimerExecutorJob.TIMER_PERSISTENCE, timerPersistence);
+		
 		SimpleTrigger trigger = new SimpleTrigger(createUniqueTimerJobId(message),
 													Scheduler.DEFAULT_GROUP, 
 													createActivationTime(message), 
@@ -54,10 +55,6 @@
 			logger.error("Error scheduling timer " + message.getProcessInstanceId(), e);
 		}
 		logger.info("New timer scheduled");
-		//TimerState timerState = new TimerState();
-		//timerState.setProcessInstanceId(message.getProcessInstanceId());
-		//timerPersistence.save(timerState);
-		//timerPersistence.isExecutable(message.getProcessInstanceId());
 	}
 
 	private Date createActivationTime(InsertScheduledTimerMessage message) {
@@ -75,7 +72,7 @@
 	}
 
 	private String createUniqueTimerJobId(TimerMessage message) {
-		return "trigger" + message.getProcessInstanceId().toString();
+		return "trigger" + String.valueOf(message.getProcessInstanceId());
 	}
 
 	public void process(TimerMessage message) {