[jboss-cvs] JBossAS SVN: r109305 - projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/ispn.

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

Author: pferraro
Date: 2010-11-12 18:35:39 -0500 (Fri, 12 Nov 2010)
New Revision: 109305

Modified:
   projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/ispn/DefaultLockManagerSource.java
Log:
Log container name, not cluster name.

Modified: projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/ispn/DefaultLockManagerSource.java
===================================================================
--- projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/ispn/DefaultLockManagerSource.java	2010-11-12 22:22:27 UTC (rev 109304)
+++ projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/ispn/DefaultLockManagerSource.java	2010-11-12 23:35:39 UTC (rev 109305)
@@ -91,7 +91,7 @@
                context.reset();
             }
             
-            debug("Started lock manager for cluster %s", entry);
+            debug("Started lock manager for \"%s\" container", containerName);
             
             container.addListener(this);
             
@@ -100,7 +100,7 @@
          
          String cacheName = cache.getName();
          
-         debug("Registering %s with lock manager for cluster %s", cacheName, entry);
+         debug("Registering \"%s\" cache with lock manager for \"%s\" container", cacheName, containerName);
          
          entry.addCache(cacheName);
          
@@ -112,12 +112,10 @@
    {
       private final SharedLocalYieldingClusterLockManager lockManager;
       private final CoreGroupCommunicationService service;
-      private final String channelName;
       private final Set<String> caches = new HashSet<String>();
       
       LockManagerEntry(Channel channel)
       {
-         this.channelName = channel.getName();
          this.service = new CoreGroupCommunicationService();
          this.service.setChannel(channel);
          this.service.setScopeId(SCOPE_ID);
@@ -182,16 +180,6 @@
          
          return empty;
       }
-
-      /**
-       * {@inheritDoc}
-       * @see java.lang.Object#toString()
-       */
-      @Override
-      public String toString()
-      {
-         return this.channelName;
-      }
    }
    
    @CacheStopped
@@ -208,12 +196,12 @@
          {
             String cacheName = event.getCacheName();
 
-            debug("Deregistering %s from lock manager for cluster %s", cacheName, entry);
+            debug("Deregistering \"%s\" cache from lock manager for \"%s\" container", cacheName, containerName);
             
             // Returns true if this was the last cache
             if (entry.removeCache(cacheName))
             {
-               debug("Stopped lock manager for cluster %s", entry);
+               debug("Stopped lock manager for \"%s\" container", containerName);
                
                lockManagers.remove(containerName);