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

[Brian Stansberry]

  User: bstansberry
  Date: 06/11/05 15:19:43

  Modified:    src/org/jboss/cache  TreeCache.java
  Log:
  Refactor JMX registration to decouple from TreeCache class
  
  Revision  Changes    Path
  1.262     +20 -5     JBossCache/src/org/jboss/cache/TreeCache.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TreeCache.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/TreeCache.java,v
  retrieving revision 1.261
  retrieving revision 1.262
  diff -u -b -r1.261 -r1.262
  --- TreeCache.java	5 Nov 2006 05:04:47 -0000	1.261
  +++ TreeCache.java	5 Nov 2006 20:19:43 -0000	1.262
  @@ -91,7 +91,7 @@
    * @author <a href="mailto:manik at jboss.org">Manik Surtani (manik at jboss.org)</a>
    * @author Brian Stansberry
    * @author Daniel Huang (dhuang at jboss.org)
  - * @version $Id: TreeCache.java,v 1.261 2006/11/05 05:04:47 bstansberry Exp $
  + * @version $Id: TreeCache.java,v 1.262 2006/11/05 20:19:43 bstansberry Exp $
    *          <p/>
    * @see <a href="http://labs.jboss.com/portal/jbosscache/docs">JBossCache doc</a>
    */
  @@ -241,6 +241,8 @@
      private StateTransferManager stateTransferManager;
      private Notifier notifier;
      private CacheSPI rootSpi;
  +   private CacheMBean cacheMBean;
  +
   
      public StateTransferManager getStateTransferManager()
      {
  @@ -682,7 +684,9 @@
            MBeanServer mbserver = JmxUtil.getMBeanServer();
            if (mbserver != null)
            {
  -            JmxUtil.registerInterceptors(mbserver, this, true);
  +            String cacheObjectName = JmxUtil.getCacheObjectName(getCacheSPI());
  +            JmxUtil.registerCacheMBean(mbserver, getCacheMBeanInterface(), cacheObjectName);
  +            JmxUtil.registerInterceptors(mbserver, getInterceptors(), cacheObjectName);
            }
         }
   
  @@ -781,7 +785,7 @@
       */
      public void destroy()
      {
  -      // unregister interceptor mbeans
  +      // unregister mbeans
         if (configuration.isUseMbean())
         {
            MBeanServer mbserver = JmxUtil.getMBeanServer();
  @@ -789,7 +793,9 @@
            {
               try
               {
  -               JmxUtil.unregisterInterceptors(mbserver, this, true);
  +               String cacheObjectName = JmxUtil.getCacheObjectName(getCacheSPI());
  +               JmxUtil.unregisterCacheMBean(mbserver, cacheObjectName);
  +               JmxUtil.unregisterInterceptors(mbserver, getInterceptors(), cacheObjectName);
               }
               catch (Exception e)
               {
  @@ -3435,7 +3441,16 @@
   
      public CacheMBean getCacheMBeanInterface()
      {
  -      return new org.jboss.cache.jmx.Cache(getCacheSPI());
  +      if (cacheMBean == null)
  +      {
  +         cacheMBean = new org.jboss.cache.jmx.Cache(getCacheSPI());
  +      }
  +      return cacheMBean;
  +   }
  +   
  +   public void setCacheMBeanInterface(CacheMBean mbean)
  +   {
  +      this.cacheMBean = mbean;
      }
   
      /**