[jboss-cvs] JBossCache/src-50/org/jboss/cache/pojo/impl ...

[Brian Stansberry]

  User: bstansberry
  Date: 06/11/09 22:00:15

  Modified:    src-50/org/jboss/cache/pojo/impl  PojoCacheImpl.java
  Log:
  PojoCache does not directly do MBean registration
  
  Revision  Changes    Path
  1.26      +1 -38     JBossCache/src-50/org/jboss/cache/pojo/impl/PojoCacheImpl.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PojoCacheImpl.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src-50/org/jboss/cache/pojo/impl/PojoCacheImpl.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -b -r1.25 -r1.26
  --- PojoCacheImpl.java	10 Nov 2006 02:48:46 -0000	1.25
  +++ PojoCacheImpl.java	10 Nov 2006 03:00:15 -0000	1.26
  @@ -22,8 +22,6 @@
   import org.jboss.cache.pojo.PojoCache;
   import org.jboss.cache.pojo.PojoCacheException;
   import org.jboss.cache.pojo.PojoCacheListener;
  -import org.jboss.cache.pojo.jmx.JmxUtil;
  -import org.jboss.cache.pojo.util.AopUtil;
   import org.jboss.cache.pojo.annotation.Attach;
   import org.jboss.cache.pojo.annotation.Detach;
   import org.jboss.cache.pojo.annotation.Find;
  @@ -32,7 +30,6 @@
   import org.jboss.aop.proxy.ClassProxy;
   import org.jboss.aop.Advised;
   
  -import javax.management.MBeanServer;
   import java.lang.reflect.Field;
   import java.util.Collection;
   import java.util.Collections;
  @@ -45,7 +42,7 @@
    * Implementation class for PojoCache interface
    *
    * @author Ben Wang
  - * @version $Id: PojoCacheImpl.java,v 1.25 2006/11/10 02:48:46 bstansberry Exp $
  + * @version $Id: PojoCacheImpl.java,v 1.26 2006/11/10 03:00:15 bstansberry Exp $
    */
   public class PojoCacheImpl implements PojoCache, Observer
   {
  @@ -237,22 +234,6 @@
            throw new PojoCacheException("PojoCache create exception", e);
         }
   
  -      if(cache_.getConfiguration().getExposeManagementStatistics())
  -      {
  -         MBeanServer mbserver = JmxUtil.getMBeanServer();
  -         if (mbserver != null)
  -         {
  -            try
  -            {
  -               JmxUtil.registerPojoCache(mbserver, this);
  -            } catch (Exception e)
  -            {
  -               throw new PojoCacheException("Exception in MBean registration", e);
  -            }
  -         }
  -
  -      }
  -
         hasCreate_ = true;
      }
   
  @@ -282,24 +263,6 @@
      public void destroy() throws PojoCacheException
      {
         cache_.destroy();
  -
  -      // unregister interceptor mbeans
  -      if (cache_.getConfiguration().getExposeManagementStatistics())
  -      {
  -         MBeanServer mbserver = JmxUtil.getMBeanServer();
  -         if (mbserver != null)
  -         {
  -            try
  -            {
  -               JmxUtil.unregisterPojoCache(mbserver, this);
  -            }
  -            catch (Exception e)
  -            {
  -               new PojoCacheException("failed unregistering PojoCache mbean ", e);
  -            }
  -         }
  -      }
  -
      }
   
      public void addListener(PojoCacheListener listener)