Merged V3.2 to HEAD

19304: Removed static (singleton) usage of CacheFactory


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19306 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2010-03-15 22:46:14 +00:00
parent deb5fc9c08
commit e9470875a9
2 changed files with 2 additions and 2 deletions

View File

@@ -66,7 +66,7 @@ public class EhCacheManagerFactoryBean implements FactoryBean, InitializingBean,
{ {
URL configUrl = this.configLocation.getURL(); URL configUrl = this.configLocation.getURL();
logger.info("Initializing EHCache CacheManager using URL: " + configLocation); logger.info("Initializing EHCache CacheManager using URL: " + configLocation);
this.cacheManager = CacheManager.create(configUrl); this.cacheManager = new CacheManager(configUrl);
} }
catch (IOException e) catch (IOException e)
{ {

View File

@@ -109,7 +109,7 @@ public class InternalEhCacheManagerFactoryBean implements FactoryBean<CacheManag
{ {
throw new AlfrescoRuntimeException("Missing default cache config: " + DEFAULT_CONFIGURATION_FILE); throw new AlfrescoRuntimeException("Missing default cache config: " + DEFAULT_CONFIGURATION_FILE);
} }
InternalEhCacheManagerFactoryBean.cacheManager = CacheManager.create(configUrl); InternalEhCacheManagerFactoryBean.cacheManager = new CacheManager(configUrl);
defaultLocation = true; defaultLocation = true;
} }
// done // done