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

[Brian Stansberry]

  User: bstansberry
  Date: 06/11/09 21:46:45

  Modified:    src/org/jboss/cache  TreeCache.java
  Log:
  TreeCache does not directly do MBean registration
  
  Revision  Changes    Path
  1.263     +3 -33     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.262
  retrieving revision 1.263
  diff -u -b -r1.262 -r1.263
  --- TreeCache.java	5 Nov 2006 20:19:43 -0000	1.262
  +++ TreeCache.java	10 Nov 2006 02:46:45 -0000	1.263
  @@ -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.262 2006/11/05 20:19:43 bstansberry Exp $
  + * @version $Id: TreeCache.java,v 1.263 2006/11/10 02:46:45 bstansberry Exp $
    *          <p/>
    * @see <a href="http://labs.jboss.com/portal/jbosscache/docs">JBossCache doc</a>
    */
  @@ -678,18 +678,6 @@
         // build interceptor chain
         interceptor_chain = new InterceptorChainFactory().buildInterceptorChain(this);
   
  -      // register interceptor mbeans
  -      if (configuration.isUseMbean())
  -      {
  -         MBeanServer mbserver = JmxUtil.getMBeanServer();
  -         if (mbserver != null)
  -         {
  -            String cacheObjectName = JmxUtil.getCacheObjectName(getCacheSPI());
  -            JmxUtil.registerCacheMBean(mbserver, getCacheMBeanInterface(), cacheObjectName);
  -            JmxUtil.registerInterceptors(mbserver, getInterceptors(), cacheObjectName);
  -         }
  -      }
  -
         regionManager.setDefaultInactive(configuration.isInactiveOnStartup());
   
         useCreateService = true;
  @@ -781,28 +769,10 @@
      }
   
      /**
  -    * Unregisters the interceptor MBeans.
  +    * No-op.
       */
      public void destroy()
      {
  -      // unregister mbeans
  -      if (configuration.isUseMbean())
  -      {
  -         MBeanServer mbserver = JmxUtil.getMBeanServer();
  -         if (mbserver != null)
  -         {
  -            try
  -            {
  -               String cacheObjectName = JmxUtil.getCacheObjectName(getCacheSPI());
  -               JmxUtil.unregisterCacheMBean(mbserver, cacheObjectName);
  -               JmxUtil.unregisterInterceptors(mbserver, getInterceptors(), cacheObjectName);
  -            }
  -            catch (Exception e)
  -            {
  -               log.error("failed unregistering cache interceptor mbeans ", e);
  -            }
  -         }
  -      }
      }