X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=mythtv%2Ftimer%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Ftimer%2FTimerBean.java;h=fffd74b892b206f734f9bbfc019d9926e77501e3;hb=28df2d5b254229d0244929342ec573f516f90938;hp=7281bdbe5ebaca13e53b7655139d25d306a632f3;hpb=29b8624a295b08705738bbafc8ff7099e621e93f;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..fffd74b8 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;
@@ -59,7 +61,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());
         }