X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=support%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fcache%2FEhCache.java;h=0df1e61f165edee1e8741536f9960cea318905ea;hb=42515fd88bee97ebb3a3180fdcb320faf5fa1d91;hp=ca11ab3f72c71f13aa92341afb6f5ba13fd064e2;hpb=fe85d022196c8578bb549945260a6e3c2017c33c;p=utils

diff --git a/support/src/main/java/org/wamblee/cache/EhCache.java b/support/src/main/java/org/wamblee/cache/EhCache.java
index ca11ab3f..0df1e61f 100644
--- a/support/src/main/java/org/wamblee/cache/EhCache.java
+++ b/support/src/main/java/org/wamblee/cache/EhCache.java
@@ -24,12 +24,16 @@ import net.sf.ehcache.Cache;
 import net.sf.ehcache.CacheException;
 import net.sf.ehcache.CacheManager;
 import net.sf.ehcache.Element;
+import net.sf.ehcache.config.Configuration;
+import net.sf.ehcache.config.ConfigurationFactory;
 
 import org.apache.log4j.Logger;
 import org.wamblee.io.InputResource;
 
 /**
  * Cache implemented on top of EhCache.
+ *
+ * @author Erik Brakkee
  */
 public class EhCache<KeyType extends Serializable, ValueType extends Serializable>
         implements org.wamblee.cache.Cache<KeyType, ValueType> {
@@ -61,7 +65,7 @@ public class EhCache<KeyType extends Serializable, ValueType extends Serializabl
             throws IOException, CacheException {
         InputStream is = aResource.getInputStream();
         try {
-            _manager = CacheManager.create(is);
+        	_manager = new CacheManager(is);
             _cache = _manager.getCache(aCacheName);
             if (_cache == null) {
                 LOGGER.warn("Creating cache '" + aCacheName
@@ -117,10 +121,6 @@ public class EhCache<KeyType extends Serializable, ValueType extends Serializabl
      * @see org.wamblee.cache.Cache#clear()
      */
     public void clear() {
-        try {
-            _cache.removeAll();
-        } catch (IOException e) {
-            throw new RuntimeException("Problem removing items from cache", e);
-        }
+        _cache.removeAll();
     }
 }