From e9470875a957bbec670b914f9bc62ee26192a48a Mon Sep 17 00:00:00 2001
From: Derek Hulley <derek.hulley@alfresco.com>
Date: Mon, 15 Mar 2010 22:46:14 +0000
Subject: [PATCH] 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
---
 .../java/org/alfresco/repo/cache/EhCacheManagerFactoryBean.java | 2 +-
 .../alfresco/repo/cache/InternalEhCacheManagerFactoryBean.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/java/org/alfresco/repo/cache/EhCacheManagerFactoryBean.java b/source/java/org/alfresco/repo/cache/EhCacheManagerFactoryBean.java
index 4993cccd95..3b44934227 100644
--- a/source/java/org/alfresco/repo/cache/EhCacheManagerFactoryBean.java
+++ b/source/java/org/alfresco/repo/cache/EhCacheManagerFactoryBean.java
@@ -66,7 +66,7 @@ public class EhCacheManagerFactoryBean implements FactoryBean, InitializingBean,
         {
             URL configUrl = this.configLocation.getURL();
             logger.info("Initializing EHCache CacheManager using URL: " + configLocation);
-            this.cacheManager = CacheManager.create(configUrl);
+            this.cacheManager = new CacheManager(configUrl);
         }
         catch (IOException e)
         {
diff --git a/source/java/org/alfresco/repo/cache/InternalEhCacheManagerFactoryBean.java b/source/java/org/alfresco/repo/cache/InternalEhCacheManagerFactoryBean.java
index 9870453e32..08ce8b124d 100644
--- a/source/java/org/alfresco/repo/cache/InternalEhCacheManagerFactoryBean.java
+++ b/source/java/org/alfresco/repo/cache/InternalEhCacheManagerFactoryBean.java
@@ -109,7 +109,7 @@ public class InternalEhCacheManagerFactoryBean implements FactoryBean<CacheManag
                 {
                     throw new AlfrescoRuntimeException("Missing default cache config: " + DEFAULT_CONFIGURATION_FILE);
                 }
-                InternalEhCacheManagerFactoryBean.cacheManager = CacheManager.create(configUrl);
+                InternalEhCacheManagerFactoryBean.cacheManager = new CacheManager(configUrl);
                 defaultLocation = true;
             }
             // done