X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=support%2Fgeneral%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fcache%2FEhCache.java;h=795a95b4070c8e5d454346a05d27dcd04a2780a5;hb=7d3754ca3d757ef89241cdbd679f82941e64cfc6;hp=1d9da8a2bcbf79c0eade4855cf2775589736f242;hpb=0d8d8f24656e585ee75558cfd6a4c661f8f14985;p=utils

diff --git a/support/general/src/main/java/org/wamblee/cache/EhCache.java b/support/general/src/main/java/org/wamblee/cache/EhCache.java
index 1d9da8a2..795a95b4 100644
--- a/support/general/src/main/java/org/wamblee/cache/EhCache.java
+++ b/support/general/src/main/java/org/wamblee/cache/EhCache.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005 the original author or authors.
+ * Copyright 2005-2010 the original author or authors.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,30 +13,30 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.wamblee.cache;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Serializable;
-
 import net.sf.ehcache.Cache;
 import net.sf.ehcache.CacheException;
 import net.sf.ehcache.CacheManager;
 import net.sf.ehcache.Element;
 
-import org.apache.log4j.Logger;
 import org.wamblee.io.InputResource;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Serializable;
+import java.util.logging.Logger;
+
 /**
  * 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> {
-
-    private static final Logger LOGGER = Logger.getLogger(EhCache.class);
+    implements org.wamblee.cache.Cache<KeyType, ValueType> {
+    private static final Logger LOGGER = Logger.getLogger(EhCache.class
+        .getName());
 
     /**
      * EH Cache manager.
@@ -60,14 +60,16 @@ public class EhCache<KeyType extends Serializable, ValueType extends Serializabl
      * @throws CacheException
      */
     public EhCache(InputResource aResource, String aCacheName)
-            throws IOException, CacheException {
+        throws IOException, CacheException {
         InputStream is = aResource.getInputStream();
+
         try {
-        	manager = new CacheManager(is);
+            manager = new CacheManager(is);
             cache = manager.getCache(aCacheName);
+
             if (cache == null) {
-                LOGGER.warn("Creating cache '" + aCacheName
-                        + "' because it is not configured");
+                LOGGER.warning("Creating cache '" + aCacheName +
+                    "' because it is not configured");
                 manager.addCache(aCacheName);
                 cache = manager.getCache(aCacheName);
             }
@@ -75,7 +77,6 @@ public class EhCache<KeyType extends Serializable, ValueType extends Serializabl
         } finally {
             is.close();
         }
-
     }
 
     /*
@@ -95,9 +96,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;
             }
+
             return (ValueType) element.getValue();
         } catch (CacheException e) {
             throw new RuntimeException("Cache problem key = '" + aKey + "'", e);