Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Synchronized cache creation on CacheManager

Browse Source 
Issue: SPR-11132
This commit is contained in:
Juergen Hoeller
2013-12-02 11:02:07 +01:00
parent ce917d5cbb
commit de890fd100
1 changed files with 37 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,9 +31,9 @@ import net.sf.ehcache.constructs.blocking.SelfPopulatingCache;
import net.sf.ehcache.constructs.blocking.UpdatingCacheEntryFactory; import net.sf.ehcache.constructs.blocking.UpdatingCacheEntryFactory;
import net.sf.ehcache.constructs.blocking.UpdatingSelfPopulatingCache; import net.sf.ehcache.constructs.blocking.UpdatingSelfPopulatingCache;
import net.sf.ehcache.event.CacheEventListener; import net.sf.ehcache.event.CacheEventListener;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.BeanNameAware; import org.springframework.beans.factory.BeanNameAware;
import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.InitializingBean;
@@ -230,46 +230,48 @@ public class EhCacheFactoryBean extends CacheConfiguration implements FactoryBea
this.cacheManager = CacheManager.getInstance(); this.cacheManager = CacheManager.getInstance();
} }
// Fetch cache region: If none with the given name exists, create one on the fly. synchronized (this.cacheManager) {
Ehcache rawCache; // Fetch cache region: If none with the given name exists, create one on the fly.
boolean cacheExists = this.cacheManager.cacheExists(cacheName); Ehcache rawCache;
if (cacheExists) { boolean cacheExists = this.cacheManager.cacheExists(cacheName);
if (logger.isDebugEnabled()) { if (cacheExists) {
logger.debug("Using existing EhCache cache region '" + cacheName + "'"); if (logger.isDebugEnabled()) {
logger.debug("Using existing EhCache cache region '" + cacheName + "'");
}
rawCache = this.cacheManager.getEhcache(cacheName);
} }
rawCache = this.cacheManager.getEhcache(cacheName); else {
} if (logger.isDebugEnabled()) {
else { logger.debug("Creating new EhCache cache region '" + cacheName + "'");
if (logger.isDebugEnabled()) { }
logger.debug("Creating new EhCache cache region '" + cacheName + "'"); rawCache = createCache();
rawCache.setBootstrapCacheLoader(this.bootstrapCacheLoader);
} }
rawCache = createCache();
rawCache.setBootstrapCacheLoader(this.bootstrapCacheLoader);
}
if (this.cacheEventListeners != null) { if (this.cacheEventListeners != null) {
for (CacheEventListener listener : this.cacheEventListeners) { for (CacheEventListener listener : this.cacheEventListeners) {
rawCache.getCacheEventNotificationService().registerListener(listener); rawCache.getCacheEventNotificationService().registerListener(listener);
}
}
if (this.statisticsEnabled) {
rawCache.setStatisticsEnabled(true);
}
if (this.sampledStatisticsEnabled) {
rawCache.setSampledStatisticsEnabled(true);
}
if (this.disabled) {
rawCache.setDisabled(true);
} }
}
if (this.statisticsEnabled) {
rawCache.setStatisticsEnabled(true);
}
if (this.sampledStatisticsEnabled) {
rawCache.setSampledStatisticsEnabled(true);
}
if (this.disabled) {
rawCache.setDisabled(true);
}
if (!cacheExists) { if (!cacheExists) {
this.cacheManager.addCache(rawCache); this.cacheManager.addCache(rawCache);
}
Ehcache decoratedCache = decorateCache(rawCache);
if (decoratedCache != rawCache) {
this.cacheManager.replaceCacheWithDecoratedCache(rawCache, decoratedCache);
}
this.cache = decoratedCache;
} }
Ehcache decoratedCache = decorateCache(rawCache);
if (decoratedCache != rawCache) {
this.cacheManager.replaceCacheWithDecoratedCache(rawCache, decoratedCache);
}
this.cache = decoratedCache;
} }
/** /**