[jboss-cvs] JBossAS SVN: r107766 - projects/ejb3/branches/infinispan-int/core/src/main/java/org/jboss/ejb3/cache/infinispan.

[jboss-cvs-commits at lists.jboss.org]

Author: pferraro
Date: 2010-08-24 12:21:36 -0400 (Tue, 24 Aug 2010)
New Revision: 107766

Modified:
   projects/ejb3/branches/infinispan-int/core/src/main/java/org/jboss/ejb3/cache/infinispan/DefaultCacheSource.java
   projects/ejb3/branches/infinispan-int/core/src/main/java/org/jboss/ejb3/cache/infinispan/InfinispanStatefulCacheFactory.java
Log:
Move CacheContainerRegistry to constructor.

Modified: projects/ejb3/branches/infinispan-int/core/src/main/java/org/jboss/ejb3/cache/infinispan/DefaultCacheSource.java
===================================================================
--- projects/ejb3/branches/infinispan-int/core/src/main/java/org/jboss/ejb3/cache/infinispan/DefaultCacheSource.java	2010-08-24 16:13:34 UTC (rev 107765)
+++ projects/ejb3/branches/infinispan-int/core/src/main/java/org/jboss/ejb3/cache/infinispan/DefaultCacheSource.java	2010-08-24 16:21:36 UTC (rev 107766)
@@ -28,7 +28,6 @@
 import org.jboss.ejb3.annotation.CacheConfig;
 import org.jboss.ejb3.stateful.StatefulContainer;
 import org.jboss.ha.ispn.CacheContainerRegistry;
-import org.jboss.ha.ispn.DefaultCacheContainerRegistry;
 
 /**
  * @author Paul Ferraro
@@ -38,9 +37,15 @@
 {
    public static final String DEFAULT_CACHE_CONTAINER = "sfsb";
    
+   private final CacheContainerRegistry registry;
+   
    private String defaultContainerName = DEFAULT_CACHE_CONTAINER;
-   private CacheContainerRegistry registry = DefaultCacheContainerRegistry.getInstance();
    
+   public DefaultCacheSource(CacheContainerRegistry registry)
+   {
+      this.registry = registry;
+   }
+   
    /**
     * {@inheritDoc}
     * @see org.jboss.ejb3.cache.infinispan.CacheSource#getCache(org.jboss.ejb3.stateful.StatefulContainer)
@@ -124,4 +129,9 @@
       
       return container.getCache(cacheName);
    }
+   
+   public void setDefaultContainerName(String defaultContainerName)
+   {
+      this.defaultContainerName = defaultContainerName;
+   }
 }

Modified: projects/ejb3/branches/infinispan-int/core/src/main/java/org/jboss/ejb3/cache/infinispan/InfinispanStatefulCacheFactory.java
===================================================================
--- projects/ejb3/branches/infinispan-int/core/src/main/java/org/jboss/ejb3/cache/infinispan/InfinispanStatefulCacheFactory.java	2010-08-24 16:13:34 UTC (rev 107765)
+++ projects/ejb3/branches/infinispan-int/core/src/main/java/org/jboss/ejb3/cache/infinispan/InfinispanStatefulCacheFactory.java	2010-08-24 16:21:36 UTC (rev 107766)
@@ -25,6 +25,7 @@
 import java.util.concurrent.ThreadFactory;
 
 import org.jboss.ejb3.cache.Ejb3CacheFactory;
+import org.jboss.ha.ispn.DefaultCacheContainerRegistry;
 import org.jboss.ha.ispn.invoker.CacheInvoker;
 import org.jboss.ha.ispn.invoker.RetryingCacheInvoker;
 
@@ -33,7 +34,7 @@
  */
 public class InfinispanStatefulCacheFactory implements Ejb3CacheFactory
 {
-   private CacheSource source = new DefaultCacheSource();
+   private CacheSource source = new DefaultCacheSource(DefaultCacheContainerRegistry.getInstance());
    private ThreadFactory threadFactory = Executors.defaultThreadFactory();
    private CacheInvoker invoker = new RetryingCacheInvoker(0, 0);