Author: adamw Date: 2005-10-28 11:48:33 -0400 (Fri, 28 Oct 2005) New Revision: 1464 Modified: trunk/forge/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeTimer.java trunk/forge/portal-extensions/shotoku/shotoku-svn-service/src/java/org/jboss/shotoku/svn/service/SvnServiceTimer.java Log: Timer fix Modified: trunk/forge/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeTimer.java =================================================================== --- trunk/forge/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeTimer.java 2005-10-28 15:26:18 UTC (rev 1463) +++ trunk/forge/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeTimer.java 2005-10-28 15:48:33 UTC (rev 1464) @@ -1,7 +1,5 @@ package org.jboss.forge.service; -import java.util.Date; - import javax.annotation.Resource; import javax.ejb.Local; import javax.ejb.SessionContext; @@ -24,14 +22,10 @@ @Local(ForgeTimerLocal.class) public class ForgeTimer implements ForgeTimerLocal { private @Resource SessionContext ctx; - private static boolean once=true; public void scheduleTimer(long interval) { - if(once) { - ctx.getTimerService().createTimer(new Date(new Date().getTime() + interval), - null); - once = false; - } + // ctx.getTimerService().createTimer(new Date(new Date().getTime() + interval), null); + ctx.getTimerService().createTimer(0, interval, null); } @Timeout @@ -50,7 +44,7 @@ // Scheduling next timer to timeout after the amount of time that // is set in forgeManagement. - scheduleTimer(fm.getTimerInterval()); + // scheduleTimer(fm.getTimerInterval()); } catch (MalformedObjectNameException e) { e.printStackTrace(); } Modified: trunk/forge/portal-extensions/shotoku/shotoku-svn-service/src/java/org/jboss/shotoku/svn/service/SvnServiceTimer.java =================================================================== --- trunk/forge/portal-extensions/shotoku/shotoku-svn-service/src/java/org/jboss/shotoku/svn/service/SvnServiceTimer.java 2005-10-28 15:26:18 UTC (rev 1463) +++ trunk/forge/portal-extensions/shotoku/shotoku-svn-service/src/java/org/jboss/shotoku/svn/service/SvnServiceTimer.java 2005-10-28 15:48:33 UTC (rev 1464) @@ -1,7 +1,5 @@ package org.jboss.shotoku.svn.service; -import java.util.Date; - import javax.annotation.Resource; import javax.ejb.Local; import javax.ejb.SessionContext; @@ -19,10 +17,10 @@ public class SvnServiceTimer { //private static final Logger log = Logger.getLogger(SvnServiceTimer.class); private @Resource SessionContext ctx; - private static boolean once=true; public void scheduleTimer(long interval) { - ctx.getTimerService().createTimer(new Date(new Date().getTime() + interval), null); + //ctx.getTimerService().createTimer(new Date(new Date().getTime() + interval), null); + ctx.getTimerService().createTimer(0, interval, null); } @Timeout @@ -34,10 +32,7 @@ SvnService.SVN_SERVICE_NAME, MBeanServerLocator.locate())); - if(once) { - ssi.update(); - once=false; - } + ssi.update(); // Avoiding WARN. timer.cancel(); |