X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=trunk%2Fsupport%2Fsrc%2Forg%2Fwamblee%2Fcache%2FEhCache.java;h=ca11ab3f72c71f13aa92341afb6f5ba13fd064e2;hb=f99db3c4f2bc63356d054c5db1cc277cafc98afb;hp=4f56cd3a0fd74dc203c5aa91da49989a8b8b6dc8;hpb=f0a6bf5438de940fb017e53d90b8b3f939a0893e;p=utils

diff --git a/trunk/support/src/org/wamblee/cache/EhCache.java b/trunk/support/src/org/wamblee/cache/EhCache.java
index 4f56cd3a..ca11ab3f 100644
--- a/trunk/support/src/org/wamblee/cache/EhCache.java
+++ b/trunk/support/src/org/wamblee/cache/EhCache.java
@@ -35,23 +35,25 @@ public class EhCache<KeyType extends Serializable, ValueType extends Serializabl
         implements org.wamblee.cache.Cache<KeyType, ValueType> {
 
     private static final Logger LOGGER = Logger.getLogger(EhCache.class);
-    
+
     /**
-     * EH Cache manager. 
+     * EH Cache manager.
      */
     private CacheManager _manager;
 
     /**
-     * EH cache. 
+     * EH cache.
      */
     private Cache _cache;
 
     /**
-     * Constructs a cache based on EHCache. 
-     * @param aResource Resource containing the configuration file for 
-     *    EHCache. 
-     * @param aCacheName Name of the cache to use. If a cache with this name does 
-     *    not exist, one is created based on default settings. 
+     * Constructs a cache based on EHCache.
+     * 
+     * @param aResource
+     *            Resource containing the configuration file for EHCache.
+     * @param aCacheName
+     *            Name of the cache to use. If a cache with this name does not
+     *            exist, one is created based on default settings.
      * @throws IOException
      * @throws CacheException
      */
@@ -59,14 +61,15 @@ public class EhCache<KeyType extends Serializable, ValueType extends Serializabl
             throws IOException, CacheException {
         InputStream is = aResource.getInputStream();
         try {
-            _manager = CacheManager.create();
+            _manager = CacheManager.create(is);
             _cache = _manager.getCache(aCacheName);
             if (_cache == null) {
-                LOGGER.warn("Creating cache '" + aCacheName + "' because it is not configured");;
+                LOGGER.warn("Creating cache '" + aCacheName
+                        + "' because it is not configured");
                 _manager.addCache(aCacheName);
                 _cache = _manager.getCache(aCacheName);
             }
-            assert _cache != null; 
+            assert _cache != null;
         } finally {
             is.close();
         }
@@ -89,11 +92,11 @@ public class EhCache<KeyType extends Serializable, ValueType extends Serializabl
      */
     public ValueType get(KeyType aKey) {
         try {
-            Element element =  _cache.get(aKey);
-            if ( element == null ) { 
-                return null; 
+            Element element = _cache.get(aKey);
+            if (element == null) {
+                return null;
             }
-            return (ValueType)element.getValue();
+            return (ValueType) element.getValue();
         } catch (CacheException e) {
             throw new RuntimeException("Cache problem key = '" + aKey + "'", e);
         }