X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=mythtv%2Ftimer%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Ftimer%2FTimerBean.java;h=5019ebd5c35136116f6b24c5e9bbff50e1db1b8b;hb=42515fd88bee97ebb3a3180fdcb320faf5fa1d91;hp=7281bdbe5ebaca13e53b7655139d25d306a632f3;hpb=fd58553454d0c25591fefcb9b6e9944a51e0b389;p=utils

diff --git a/mythtv/timer/src/main/java/org/wamblee/timer/TimerBean.java b/mythtv/timer/src/main/java/org/wamblee/timer/TimerBean.java
index 7281bdbe..5019ebd5 100644
--- a/mythtv/timer/src/main/java/org/wamblee/timer/TimerBean.java
+++ b/mythtv/timer/src/main/java/org/wamblee/timer/TimerBean.java
@@ -16,6 +16,8 @@
 
 package org.wamblee.timer;
 
+import java.util.Collection;
+
 import javax.annotation.Resource;
 import javax.ejb.MessageDriven;
 import javax.ejb.Timeout;
@@ -38,6 +40,8 @@ import org.wamblee.io.DirectoryMonitor;
 
 /**
  * 
+ *
+ * @author Erik Brakkee
  */
 @MessageDriven(name = "TimerBean")
 // Spring's JTA transaction manager does not work with container managed transactions
@@ -59,7 +63,11 @@ public class TimerBean implements MessageListener {
         try {
             int interval = (Integer)msg.getObject();
             LOG.info("Initializing timer with interval " + interval + " seconds");
-            _timerService.createTimer(interval*1000, interval*1000, null);
+            for (Timer timer: (Collection<Timer>)_timerService.getTimers()) { 
+            	LOG.info("Canceling old timers: " + timer);
+            	timer.cancel();
+            }
+            _timerService.createTimer(1000, interval*1000, null);
         } catch (JMSException e) {
             throw new RuntimeException(e.getMessage());
         }