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

[Manik Surtani]

  User: msurtani
  Date: 06/09/06 10:45:44

  Modified:    src/org/jboss/cache    NodeImpl.java TreeCache.java
                        TreeCacheProxyImpl.java
  Log:
  fixed JMX tests, added more JMX tests
  
  Revision  Changes    Path
  1.11      +1 -1      JBossCache/src/org/jboss/cache/NodeImpl.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: NodeImpl.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/NodeImpl.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- NodeImpl.java	30 Aug 2006 19:34:39 -0000	1.10
  +++ NodeImpl.java	6 Sep 2006 14:45:41 -0000	1.11
  @@ -260,7 +260,7 @@
         {
            if (data == null)
            {
  -            return null;
  +            return Collections.emptyMap();
            }
            return new HashMap(data);
         }
  
  
  
  1.238     +39 -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.237
  retrieving revision 1.238
  diff -u -b -r1.237 -r1.238
  --- TreeCache.java	5 Sep 2006 16:57:48 -0000	1.237
  +++ TreeCache.java	6 Sep 2006 14:45:41 -0000	1.238
  @@ -17,6 +17,7 @@
   import org.jboss.cache.factories.InterceptorChainFactory;
   import org.jboss.cache.factories.NodeFactory;
   import org.jboss.cache.interceptors.Interceptor;
  +import org.jboss.cache.jmx.CacheMBean;
   import org.jboss.cache.loader.CacheLoader;
   import org.jboss.cache.loader.CacheLoaderManager;
   import org.jboss.cache.loader.NodeData;
  @@ -94,7 +95,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.237 2006/09/05 16:57:48 msurtani Exp $
  + * @version $Id: TreeCache.java,v 1.238 2006/09/06 14:45:41 msurtani Exp $
    *          <p/>
    * @see <a href="http://labs.jboss.com/portal/jbosscache/docs">JBossCache doc</a>
    */
  @@ -3754,6 +3755,11 @@
         invocationContextContainer.set(ctx);
      }
   
  +   public CacheMBean getCacheMBeanInterface()
  +   {
  +      return new org.jboss.cache.jmx.Cache(getCacheSPI());
  +   }
  +
      /*
   * vladimir 24/08/06 Will change to ExtendedMessageListener
   * after JGroups 2.4 CR2 is released
  
  
  
  1.26      +1 -8      JBossCache/src/org/jboss/cache/TreeCacheProxyImpl.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TreeCacheProxyImpl.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/TreeCacheProxyImpl.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -b -r1.25 -r1.26
  --- TreeCacheProxyImpl.java	5 Sep 2006 18:14:44 -0000	1.25
  +++ TreeCacheProxyImpl.java	6 Sep 2006 14:45:44 -0000	1.26
  @@ -12,8 +12,6 @@
   import org.jboss.cache.eviction.RegionManager;
   import org.jboss.cache.factories.NodeFactory;
   import org.jboss.cache.interceptors.Interceptor;
  -import org.jboss.cache.interceptors.InterceptorMBean;
  -import org.jboss.cache.jmx.CacheMBean;
   import org.jboss.cache.loader.CacheLoader;
   import org.jboss.cache.loader.CacheLoaderManager;
   import org.jboss.cache.lock.IdentityLock;
  @@ -39,7 +37,7 @@
    *
    * @author <a href="mailto:manik at jboss.org">Manik Surtani (manik at jboss.org)</a>
    */
  -public class TreeCacheProxyImpl implements CacheMBean, CacheSPI, NodeSPI
  +public class TreeCacheProxyImpl implements CacheSPI, NodeSPI
   {
      public TreeCache treeCache;
      public NodeImpl currentNode;
  @@ -553,9 +551,4 @@
      {
         currentNode.setChildrenLoaded(b);
      }
  -
  -   public List<InterceptorMBean> getInterceptorMBeanChain()
  -   {
  -      return treeCache.getInterceptors();
  -   }
   }