[infinispan-commits] Infinispan SVN: r1987 - in trunk/cachestore/remote/src: test/java/org/infinispan/loaders/remote and 1 other directory.

[infinispan-commits at lists.jboss.org]

Author: galder.zamarreno at jboss.com
Date: 2010-07-06 08:23:05 -0400 (Tue, 06 Jul 2010)
New Revision: 1987

Modified:
   trunk/cachestore/remote/src/main/java/org/infinispan/loaders/remote/RemoteCacheStore.java
   trunk/cachestore/remote/src/test/java/org/infinispan/loaders/remote/RemoteCacheStoreTest.java
Log:
[ISPN-489] (Avoid reading cache name for default cache in Hot Rod) Forgot to update the remote cache store.

Modified: trunk/cachestore/remote/src/main/java/org/infinispan/loaders/remote/RemoteCacheStore.java
===================================================================
--- trunk/cachestore/remote/src/main/java/org/infinispan/loaders/remote/RemoteCacheStore.java	2010-07-06 12:21:43 UTC (rev 1986)
+++ trunk/cachestore/remote/src/main/java/org/infinispan/loaders/remote/RemoteCacheStore.java	2010-07-06 12:23:05 UTC (rev 1987)
@@ -8,6 +8,7 @@
 import org.infinispan.loaders.CacheLoaderConfig;
 import org.infinispan.loaders.CacheLoaderException;
 import org.infinispan.loaders.CacheLoaderMetadata;
+import org.infinispan.manager.CacheContainer;
 import org.infinispan.marshall.Marshaller;
 import org.infinispan.util.logging.Log;
 import org.infinispan.util.logging.LogFactory;
@@ -135,7 +136,10 @@
 
       if (marshaller == null) {throw new IllegalStateException("Null marshaller not allowed!");}
       remoteCacheManager = new RemoteCacheManager(new InternalCacheEntryMarshaller(marshaller), config.getHotRodClientProperties());
-      remoteCache = remoteCacheManager.getCache(config.getRemoteCacheName());
+      if (config.getRemoteCacheName().equals(CacheContainer.DEFAULT_CACHE_NAME))
+         remoteCache = remoteCacheManager.getCache();
+      else
+         remoteCache = remoteCacheManager.getCache(config.getRemoteCacheName());
    }
 
    @Override

Modified: trunk/cachestore/remote/src/test/java/org/infinispan/loaders/remote/RemoteCacheStoreTest.java
===================================================================
--- trunk/cachestore/remote/src/test/java/org/infinispan/loaders/remote/RemoteCacheStoreTest.java	2010-07-06 12:21:43 UTC (rev 1986)
+++ trunk/cachestore/remote/src/test/java/org/infinispan/loaders/remote/RemoteCacheStoreTest.java	2010-07-06 12:23:05 UTC (rev 1987)
@@ -47,7 +47,7 @@
       return remoteCacheStore;
    }
 
-   @AfterTest
+   @AfterTest(alwaysRun = true)
    public void tearDown() {
       hrServer.stop();
       localCacheManager.stop();