[jboss-cvs] JBossCache/src/org/jboss/cache/jmx ...

[Brian Stansberry]

  User: bstansberry
  Date: 07/05/11 12:48:57

  Modified:    src/org/jboss/cache/jmx  JmxUtil.java
  Log:
  [JBCACHE-1055] Remove Configuration's serviceName property
  getCacheObjectName(CacheSPI) should be getCacheObjectName(Cache)
  
  Revision  Changes    Path
  1.12      +9 -12     JBossCache/src/org/jboss/cache/jmx/JmxUtil.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: JmxUtil.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/jmx/JmxUtil.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -b -r1.11 -r1.12
  --- JmxUtil.java	9 May 2007 18:24:58 -0000	1.11
  +++ JmxUtil.java	11 May 2007 16:48:57 -0000	1.12
  @@ -35,7 +35,7 @@
    *
    * @author Jerry Gauthier
    * @author Manik Surtani
  - * @version $Id: JmxUtil.java,v 1.11 2007/05/09 18:24:58 bstansberry Exp $
  + * @version $Id: JmxUtil.java,v 1.12 2007/05/11 16:48:57 bstansberry Exp $
    */
   public class JmxUtil
   {
  @@ -112,7 +112,7 @@
         }
      }
   
  -   public static String getCacheObjectName(org.jboss.cache.CacheSPI cache)
  +   public static String getCacheObjectName(org.jboss.cache.Cache cache)
      {
         // get the cache's registration name
         return getCacheObjectName(cache.getConfiguration(), cache.getClass().getName());
  @@ -121,9 +121,7 @@
      public static String getCacheObjectName(Configuration config, String cacheSPIClass)
      {
         // get the cache's registration name
  -      String tmpName = config.getServiceName();
  -      if (tmpName == null)
  -      {
  +      String tmpName = null;
            if (config.getClusterName() == null)
            {
               tmpName = PREFIX + cacheSPIClass + System.currentTimeMillis();
  @@ -132,7 +130,6 @@
            {
               tmpName = PREFIX + config.getClusterName();
            }
  -      }
   
         return tmpName;
      }