root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

EhCacheFactoryBean calls addCache after listener registration 

Issue: SPR-10904
This commit is contained in:
Juergen Hoeller 2013-09-14 07:05:24 +02:00 committed by unknown
parent e213561dac
commit a3df311bb5
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spring-context-support/src/main/java/org/springframework/cache/ehcache/EhCacheFactoryBean.java vendored
View File

@ -231,7 +231,8 @@ public class EhCacheFactoryBean extends CacheConfiguration implements FactoryBea
// Fetch cache region: If none with the given name exists, create one on the fly. // Fetch cache region: If none with the given name exists, create one on the fly.
Ehcache rawCache; Ehcache rawCache;
if (this.cacheManager.cacheExists(cacheName)) { boolean cacheExists = this.cacheManager.cacheExists(cacheName);
if (cacheExists) {
if (logger.isDebugEnabled()) { if (logger.isDebugEnabled()) {
logger.debug("Using existing EhCache cache region '" + cacheName + "'"); logger.debug("Using existing EhCache cache region '" + cacheName + "'");
} }
@ -243,7 +244,6 @@ public class EhCacheFactoryBean extends CacheConfiguration implements FactoryBea
} }
rawCache = createCache(); rawCache = createCache();
rawCache.setBootstrapCacheLoader(this.bootstrapCacheLoader); rawCache.setBootstrapCacheLoader(this.bootstrapCacheLoader);
this.cacheManager.addCache(rawCache);
} }
if (this.cacheEventListeners != null) { if (this.cacheEventListeners != null) {
@ -261,7 +261,9 @@ public class EhCacheFactoryBean extends CacheConfiguration implements FactoryBea
rawCache.setDisabled(true); rawCache.setDisabled(true);
} }
// Decorate cache if necessary. if (!cacheExists) {
this.cacheManager.addCache(rawCache);
}
Ehcache decoratedCache = decorateCache(rawCache); Ehcache decoratedCache = decorateCache(rawCache);
if (decoratedCache != rawCache) { if (decoratedCache != rawCache) {
this.cacheManager.replaceCacheWithDecoratedCache(rawCache, decoratedCache); this.cacheManager.replaceCacheWithDecoratedCache(rawCache, decoratedCache);