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

EhCacheFactoryBean calls CacheManager.addCache before setStatisticsEnabled 

Issue: SPR-11080
Issue: SPR-11092
This commit is contained in:
Juergen Hoeller 2013-12-03 01:30:22 +01:00
parent 6224ddd0cb
commit 6ce2eb9622
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -321,6 +321,7 @@ public class EhCacheFactoryBean implements FactoryBean<Ehcache>, BeanNameAware,
// create one on the fly. // create one on the fly.
Ehcache rawCache; Ehcache rawCache;
boolean cacheExists = this.cacheManager.cacheExists(this.cacheName); boolean cacheExists = this.cacheManager.cacheExists(this.cacheName);
if (cacheExists) { if (cacheExists) {
if (logger.isDebugEnabled()) { if (logger.isDebugEnabled()) {
logger.debug("Using existing EhCache cache region '" + this.cacheName + "'"); logger.debug("Using existing EhCache cache region '" + this.cacheName + "'");
@ -339,6 +340,12 @@ public class EhCacheFactoryBean implements FactoryBean<Ehcache>, BeanNameAware,
rawCache.getCacheEventNotificationService().registerListener(listener); rawCache.getCacheEventNotificationService().registerListener(listener);
} }
} }
// Needs to happen after listener registration but before setStatisticsEnabled
if (!cacheExists) {
this.cacheManager.addCache(rawCache);
}
if (this.statisticsEnabled) { if (this.statisticsEnabled) {
rawCache.setStatisticsEnabled(true); rawCache.setStatisticsEnabled(true);
} }
@ -349,9 +356,6 @@ public class EhCacheFactoryBean implements FactoryBean<Ehcache>, BeanNameAware,
rawCache.setDisabled(true); rawCache.setDisabled(true);
} }
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);