From 29c51ecb95bd856712743eeea6e376f6a1b0788a Mon Sep 17 00:00:00 2001 From: Robin Bygrave Date: Thu, 21 Apr 2016 10:33:09 +1200 Subject: [PATCH] #655 - DB Migration should not require running L2 cache (ie. Hazel cast server etc) --- .../avaje/ebeaninternal/server/core/DefaultContainer.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultContainer.java b/src/main/java/com/avaje/ebeaninternal/server/core/DefaultContainer.java index 8258287ad..e737d5417 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultContainer.java +++ b/src/main/java/com/avaje/ebeaninternal/server/core/DefaultContainer.java @@ -108,7 +108,7 @@ public class DefaultContainer implements SpiContainer { // inform the NamingConvention of the associated DatabasePlatform serverConfig.getNamingConvention().setDatabasePlatform(serverConfig.getDatabasePlatform()); - ServerCacheManager cacheManager = getCacheManager(serverConfig); + ServerCacheManager cacheManager = getCacheManager(online, serverConfig); SpiBackgroundExecutor bgExecutor = createBackgroundExecutor(serverConfig); @@ -147,9 +147,10 @@ public class DefaultContainer implements SpiContainer { /** * Create and return the CacheManager. */ - private ServerCacheManager getCacheManager(ServerConfig serverConfig) { + private ServerCacheManager getCacheManager(boolean online, ServerConfig serverConfig) { - if (serverConfig.isDisableL2Cache()) { + if (!online || serverConfig.isDisableL2Cache()) { + // use local only L2 cache implementation as placeholder return new DefaultServerCacheManager(); }