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

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

Author: pferraro
Date: 2010-09-08 11:10:25 -0400 (Wed, 08 Sep 2010)
New Revision: 108039

Modified:
   projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/framework/server/ispn/HAPartitionCacheHandler.java
   projects/cluster/ha-server-cache-ispn/trunk/src/test/java/org/jboss/ha/framework/server/ispn/HAPartitionCacheHandlerTest.java
Log:
Change getCacheConfigName() to return container + cache name.

Modified: projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/framework/server/ispn/HAPartitionCacheHandler.java
===================================================================
--- projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/framework/server/ispn/HAPartitionCacheHandler.java	2010-09-08 14:11:51 UTC (rev 108038)
+++ projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/framework/server/ispn/HAPartitionCacheHandler.java	2010-09-08 15:10:25 UTC (rev 108039)
@@ -150,19 +150,28 @@
    @Override
    public String getCacheConfigName()
    {
-      return this.cacheName;
+      StringBuilder builder = new StringBuilder();
+      
+      if (this.cacheContainerName != null)
+      {
+         builder.append(this.cacheContainerName);
+      }
+      if (this.cacheName != null)
+      {
+         if (builder.length() > 0)
+         {
+            builder.append("/");
+         }
+         builder.append(this.cacheName);
+      }
+      return builder.toString();
    }
    
-   public void setCacheConfigName(String cacheName)
+   public void setCacheName(String cacheName)
    {
       this.cacheName = cacheName;
    }
    
-   public String getCacheContainerName()
-   {
-      return this.cacheContainerName;
-   }
-   
    public void setCacheContainerName(String cacheContainerName)
    {
       this.cacheContainerName = cacheContainerName;

Modified: projects/cluster/ha-server-cache-ispn/trunk/src/test/java/org/jboss/ha/framework/server/ispn/HAPartitionCacheHandlerTest.java
===================================================================
--- projects/cluster/ha-server-cache-ispn/trunk/src/test/java/org/jboss/ha/framework/server/ispn/HAPartitionCacheHandlerTest.java	2010-09-08 14:11:51 UTC (rev 108038)
+++ projects/cluster/ha-server-cache-ispn/trunk/src/test/java/org/jboss/ha/framework/server/ispn/HAPartitionCacheHandlerTest.java	2010-09-08 15:10:25 UTC (rev 108039)
@@ -126,7 +126,7 @@
       
       HAPartitionCacheHandler<Object, Object> handler = new HAPartitionCacheHandler<Object, Object>(registry);
       handler.setCacheContainerName("container");
-      handler.setCacheConfigName("cache");
+      handler.setCacheName("cache");
       
       Assert.assertNull(handler.getCache());