Refactor initialization logic for cache container.

zanata · Nov 28, 2014 · 0501b44 · 0501b44
1 parent b2c6d3b
commit 0501b44
Showing 1 changed file with 13 additions and 15 deletions.
diff --git a/zanata-war/src/main/java/org/zanata/cache/CacheContainerProducer.java b/zanata-war/src/main/java/org/zanata/cache/CacheContainerProducer.java
@@ -52,24 +52,22 @@ public class CacheContainerProducer {
 
     @Create
     public void initialize() {
-        getCacheContainer();
+        try {
+            container =
+                    ServiceLocator.instance().getJndiComponent(
+                            CACHE_CONTAINER_NAME,
+                            CacheContainer.class);
+        } catch (NamingException e) {
+            String msg = "A cache container with name " +
+                    "'" + CACHE_CONTAINER_NAME + "' " +
+                    "has not been configured.";
+            log.warn(msg);
+            throw new RuntimeException(msg, e);
+        }
     }
 
     @Unwrap
-    public synchronized CacheContainer getCacheContainer() {
-        if(container == null) {
-            try {
-                return ServiceLocator.instance().getJndiComponent(CACHE_CONTAINER_NAME,
-                        CacheContainer.class);
-            }
-            catch (NamingException e) {
-                String msg = "A cache container with name " +
-                        "'" + CACHE_CONTAINER_NAME + "' " +
-                        "has not been configured.";
-                log.warn(msg);
-                throw new RuntimeException(msg, e);
-            }
-        }
+    public CacheContainer getCacheContainer() {
         return container;
     }
 }