[jboss-cvs] JBossAS SVN: r106544 - in projects/cluster/ha-server-ispn/trunk/src: test/java/org/jboss/ha/ispn and 1 other directory.

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

Author: pferraro
Date: 2010-07-09 17:22:14 -0400 (Fri, 09 Jul 2010)
New Revision: 106544

Modified:
   projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/CacheContainerRegistry.java
   projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/DefaultCacheContainerRegistry.java
   projects/cluster/ha-server-ispn/trunk/src/test/java/org/jboss/ha/ispn/DefaultCacheContainerRegistryTest.java
Log:
Rename getDefaultCacheContainer() -> getCacheContainer(), to match CacheContainer.getCache()

Modified: projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/CacheContainerRegistry.java
===================================================================
--- projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/CacheContainerRegistry.java	2010-07-09 20:22:29 UTC (rev 106543)
+++ projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/CacheContainerRegistry.java	2010-07-09 21:22:14 UTC (rev 106544)
@@ -36,7 +36,7 @@
     * Equivalent to getCacheContainer(null).
     * @return an Infinispan cache container.
     */
-   CacheContainer getDefaultCacheContainer();
+   CacheContainer getCacheContainer();
    
    /**
     * Returns the cache container associated with the specified identifier,

Modified: projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/DefaultCacheContainerRegistry.java
===================================================================
--- projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/DefaultCacheContainerRegistry.java	2010-07-09 20:22:29 UTC (rev 106543)
+++ projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/DefaultCacheContainerRegistry.java	2010-07-09 21:22:14 UTC (rev 106544)
@@ -136,10 +136,10 @@
 
    /**
     * {@inheritDoc}
-    * @see org.jboss.ha.ispn.CacheContainerRegistry#getDefaultCacheContainer()
+    * @see org.jboss.ha.ispn.CacheContainerRegistry#getCacheContainer()
     */
    @Override
-   public CacheContainer getDefaultCacheContainer()
+   public CacheContainer getCacheContainer()
    {
       return this.defaultContainer;
    }

Modified: projects/cluster/ha-server-ispn/trunk/src/test/java/org/jboss/ha/ispn/DefaultCacheContainerRegistryTest.java
===================================================================
--- projects/cluster/ha-server-ispn/trunk/src/test/java/org/jboss/ha/ispn/DefaultCacheContainerRegistryTest.java	2010-07-09 20:22:29 UTC (rev 106543)
+++ projects/cluster/ha-server-ispn/trunk/src/test/java/org/jboss/ha/ispn/DefaultCacheContainerRegistryTest.java	2010-07-09 21:22:14 UTC (rev 106544)
@@ -79,6 +79,7 @@
       Assert.assertTrue(names.contains("default"));
       Assert.assertTrue(names.contains("other"));
       
+      Assert.assertSame(defaultCacheManager, registry.getCacheContainer());
       Assert.assertSame(defaultCacheManager, registry.getCacheContainer(null));
       Assert.assertSame(defaultCacheManager, registry.getCacheContainer("default"));
       Assert.assertSame(defaultCacheManager, registry.getCacheContainer("unknown"));
@@ -169,6 +170,7 @@
       Assert.assertTrue(names.contains("default"));
       Assert.assertTrue(names.contains("other"));
       
+      Assert.assertSame(defaultCacheManager, registry.getCacheContainer());
       Assert.assertSame(defaultCacheManager, registry.getCacheContainer(null));
       Assert.assertSame(defaultCacheManager, registry.getCacheContainer("default"));
       Assert.assertSame(defaultCacheManager, registry.getCacheContainer("unknown"));