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

[Manik Surtani]

  User: msurtani
  Date: 06/07/19 17:34:45

  Modified:    src/org/jboss/cache/util  MBeanConfigurator.java
  Log:
  JBCACHE-657
  JBCACHE-594
  
  Revision  Changes    Path
  1.7       +7 -8      JBossCache/src/org/jboss/cache/util/MBeanConfigurator.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: MBeanConfigurator.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/util/MBeanConfigurator.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- MBeanConfigurator.java	31 Mar 2006 17:49:28 -0000	1.6
  +++ MBeanConfigurator.java	19 Jul 2006 21:34:45 -0000	1.7
  @@ -22,7 +22,6 @@
   package org.jboss.cache.util;
   
   import org.jboss.cache.TreeCache;
  -import org.jboss.cache.interceptors.BaseInterceptor;
   import org.jboss.cache.interceptors.Interceptor;
   
   import javax.management.MBeanServer;
  @@ -32,7 +31,7 @@
   /**
    * JBoss cache management configurator
    * @author Jerry Gauthier
  - * @version $Id: MBeanConfigurator.java,v 1.6 2006/03/31 17:49:28 jerrygauth Exp $
  + * @version $Id: MBeanConfigurator.java,v 1.7 2006/07/19 21:34:45 msurtani Exp $
    */
   public class MBeanConfigurator
   {
  @@ -60,8 +59,8 @@
         String tmpName = cache.getServiceName() != null? cache.getServiceName().toString() : null;
         if(tmpName == null)
         {         
  -         tmpName = PREFIX + cache.getClusterName();
  -         if(cache.getClusterName() == null)
  +         tmpName = PREFIX + cache.getConfiguration().getClusterName();
  +         if(cache.getConfiguration().getClusterName() == null)
               tmpName = PREFIX + cache.getClass().getName() + System.currentTimeMillis();
         }
         // register the cache
  @@ -98,9 +97,9 @@
               if (mbeanExists)
                  // register associated interceptor mbean
                  server.registerMBean(interceptor, objName);
  -            else
  +            //else
                  // register dummy interceptor mbean
  -               server.registerMBean(new BaseInterceptor(), objName);
  +              // server.registerMBean(new BaseInterceptor(), objName);
            }
         }
      }
  @@ -125,8 +124,8 @@
         String tmpName = cache.getServiceName() != null? cache.getServiceName().toString() : null;
         if(tmpName == null)
         {         
  -         tmpName = PREFIX + cache.getClusterName();
  -         if(cache.getClusterName() == null)
  +         tmpName = PREFIX + cache.getConfiguration().getClusterName();
  +         if(cache.getConfiguration().getClusterName() == null)
               tmpName = PREFIX + cache.getClass().getName() + System.currentTimeMillis();
         }