From dbac28b2d90c4b674543c816461b0b611aee6ea3 Mon Sep 17 00:00:00 2001 From: James Roper Date: Thu, 8 Nov 2012 10:57:43 +1100 Subject: [PATCH] Remove double wait for cache warmer delay MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The CacheWarmer is run by a timer after the warm delay (default 30 seconds).  But then the first thing it does is sleeps for the warm delay.  It should just run immediately because the app has already waited for that delay.  --- .../server/core/DefaultServerFactory.java | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultServerFactory.java b/src/main/java/com/avaje/ebeaninternal/server/core/DefaultServerFactory.java index 8d4aaaea7..1a6e87bfb 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultServerFactory.java +++ b/src/main/java/com/avaje/ebeaninternal/server/core/DefaultServerFactory.java @@ -244,7 +244,7 @@ public class DefaultServerFactory implements BootupEbeanManager { if (sleepMillis > 0) { Timer t = new Timer("EbeanCacheWarmer", true); - t.schedule(new CacheWarmer(sleepMillis, server), sleepMillis); + t.schedule(new CacheWarmer(server), sleepMillis); } } @@ -495,23 +495,13 @@ public class DefaultServerFactory implements BootupEbeanManager { private static class CacheWarmer extends TimerTask { - private static final Logger log = Logger.getLogger(CacheWarmer.class.getName()); - - private final long sleepMillis; private final EbeanServer server; - CacheWarmer(long sleepMillis, EbeanServer server) { - this.sleepMillis = sleepMillis; + CacheWarmer(EbeanServer server) { this.server = server; } public void run() { - try { - Thread.sleep(sleepMillis); - } catch (InterruptedException e) { - String msg = "Error while sleeping prior to cache warming"; - log.log(Level.SEVERE, msg, e); - } server.runCacheWarming(); }