[infinispan-commits] Infinispan SVN: r1344 - trunk/core/src/main/java/org/infinispan.

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2010-01-06 12:41:07 -0500 (Wed, 06 Jan 2010)
New Revision: 1344

Modified:
   trunk/core/src/main/java/org/infinispan/AbstractDelegatingAdvancedCache.java
   trunk/core/src/main/java/org/infinispan/AdvancedCache.java
   trunk/core/src/main/java/org/infinispan/CacheDelegate.java
Log:
Expose distribution manager

Modified: trunk/core/src/main/java/org/infinispan/AbstractDelegatingAdvancedCache.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/AbstractDelegatingAdvancedCache.java	2010-01-06 17:40:39 UTC (rev 1343)
+++ trunk/core/src/main/java/org/infinispan/AbstractDelegatingAdvancedCache.java	2010-01-06 17:41:07 UTC (rev 1344)
@@ -4,6 +4,7 @@
 import org.infinispan.container.DataContainer;
 import org.infinispan.context.Flag;
 import org.infinispan.context.InvocationContextContainer;
+import org.infinispan.distribution.DistributionManager;
 import org.infinispan.eviction.EvictionManager;
 import org.infinispan.factories.ComponentRegistry;
 import org.infinispan.interceptors.base.CommandInterceptor;
@@ -60,6 +61,10 @@
       return cache.getComponentRegistry();
    }
 
+   public DistributionManager getDistributionManager() {
+      return cache.getDistributionManager();
+   }
+
    public RpcManager getRpcManager() {
       return cache.getRpcManager();
    }

Modified: trunk/core/src/main/java/org/infinispan/AdvancedCache.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/AdvancedCache.java	2010-01-06 17:40:39 UTC (rev 1343)
+++ trunk/core/src/main/java/org/infinispan/AdvancedCache.java	2010-01-06 17:41:07 UTC (rev 1344)
@@ -4,6 +4,7 @@
 import org.infinispan.container.DataContainer;
 import org.infinispan.context.Flag;
 import org.infinispan.context.InvocationContextContainer;
+import org.infinispan.distribution.DistributionManager;
 import org.infinispan.eviction.EvictionManager;
 import org.infinispan.factories.ComponentRegistry;
 import org.infinispan.interceptors.base.CommandInterceptor;
@@ -93,7 +94,14 @@
     */
    ComponentRegistry getComponentRegistry();
 
+   /**
+    * Retrieves a reference to the {@link org.infinispan.distribution.DistributionManager} if the cache is configured
+    * to use Distribution.  Otherwise, returns a null.
+    * @return a DistributionManager, or null.
+    */
+   DistributionManager getDistributionManager();
 
+
    /**
     * Locks a given key eagerly across cache nodes in a cluster.
     * <p>

Modified: trunk/core/src/main/java/org/infinispan/CacheDelegate.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/CacheDelegate.java	2010-01-06 17:40:39 UTC (rev 1343)
+++ trunk/core/src/main/java/org/infinispan/CacheDelegate.java	2010-01-06 17:41:07 UTC (rev 1344)
@@ -42,6 +42,7 @@
 import org.infinispan.context.Flag;
 import org.infinispan.context.InvocationContext;
 import org.infinispan.context.InvocationContextContainer;
+import org.infinispan.distribution.DistributionManager;
 import org.infinispan.eviction.EvictionManager;
 import org.infinispan.factories.ComponentRegistry;
 import org.infinispan.factories.annotations.Inject;
@@ -115,6 +116,7 @@
    private StateTransferManager stateTransferManager;
    // as above for ResponseGenerator
    private ResponseGenerator responseGenerator;
+   private DistributionManager distributionManager;
    private long defaultLifespan, defaultMaxIdleTime;
    private ThreadLocal<PreInvocationContext> flagHolder = new ThreadLocal<PreInvocationContext>();
 
@@ -134,6 +136,7 @@
                                   BatchContainer batchContainer,
                                   RpcManager rpcManager, DataContainer dataContainer,
                                   Marshaller marshaller, ResponseGenerator responseGenerator,
+                                  DistributionManager distributionManager,
                                   CacheManager cacheManager, StateTransferManager stateTransferManager) {
       this.commandsFactory = commandsFactory;
       this.invoker = interceptorChain;
@@ -150,6 +153,7 @@
       this.responseGenerator = responseGenerator;
       this.stateTransferManager = stateTransferManager;
       this.icc = icc;
+      this.distributionManager = distributionManager; 
    }
 
    public final V putIfAbsent(K key, V value) {
@@ -346,6 +350,10 @@
       return componentRegistry;
    }
 
+   public DistributionManager getDistributionManager() {
+      return distributionManager;
+   }
+
    public ComponentStatus getStatus() {
       return componentRegistry.getStatus();
    }