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

[Manik Surtani]

  User: msurtani
  Date: 07/01/04 00:35:40

  Modified:    src/org/jboss/cache/jmx  JmxUtil.java
  Log:
  Major changes around nodes, and the way they interact with the interceptor stack.
  Also removed redundant methods in NodeSPI and removed the need for casting to NodeSPI in most cases.
  
  Revision  Changes    Path
  1.7       +24 -10    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.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- JmxUtil.java	16 Nov 2006 14:51:49 -0000	1.6
  +++ JmxUtil.java	4 Jan 2007 05:35:40 -0000	1.7
  @@ -35,7 +35,7 @@
    *
    * @author Jerry Gauthier
    * @author Manik Surtani
  - * @version $Id: JmxUtil.java,v 1.6 2006/11/16 14:51:49 msurtani Exp $
  + * @version $Id: JmxUtil.java,v 1.7 2007/01/04 05:35:40 msurtani Exp $
    */
   public class JmxUtil
   {
  @@ -52,8 +52,10 @@
      {
         ObjectName on = new ObjectName(cacheObjectName);
         if (!server.isRegistered(on))
  +      {
            server.registerMBean(cache, on);      
      }
  +   }
   
      /*
       * Register the associated mbeans for cache interceptors
  @@ -66,7 +68,9 @@
              throws Exception
      {
         if (server == null || interceptors == null || cacheObjectName == null)
  +      {
            return;
  +      }
   
         Interceptor interceptor = null;
   
  @@ -95,7 +99,9 @@
            {
               if (mbeanExists)
                  // register associated interceptor mbean
  +            {
                  server.registerMBean(interceptor, objName);
  +            }
               //else
               // register dummy interceptor mbean
               // server.registerMBean(new BaseInterceptor(), objName);
  @@ -116,10 +122,14 @@
         if (tmpName == null)
         {         
            if (config.getClusterName() == null)
  +         {
               tmpName = PREFIX + cacheSPIClass + System.currentTimeMillis();
  +         }
            else
  +         {
               tmpName = PREFIX + config.getClusterName();
         }
  +      }
   
         return tmpName;
      }
  @@ -141,13 +151,15 @@
              throws Exception
      {
         if (server == null || interceptors == null || cacheObjectName == null)
  +      {
            return;
  +      }
         
         Interceptor interceptor = null;
   
         for (int i = 0; i < interceptors.size(); i++)
         {
  -         interceptor = (Interceptor) interceptors.get(i);
  +         interceptor = interceptors.get(i);
   
            // for JDK 1.4, must parse name and remove package prefix
            // for JDK 1.5, can use getSimpleName() to establish class name without package prefix
  @@ -156,9 +168,11 @@
   
            ObjectName objName = new ObjectName(serviceName);
            if (server.isRegistered(objName))
  +         {
               server.unregisterMBean(objName);
         }
      }
  +   }
   
      public static MBeanServer getMBeanServer()
      {