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

[Manik Surtani]

  User: msurtani
  Date: 06/07/18 14:28:39

  Modified:    src/org/jboss/cache   TreeCache.java TreeCacheProxyImpl.java
  Log:
  Cache construction tests
  
  Revision  Changes    Path
  1.200     +30 -14    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.199
  retrieving revision 1.200
  diff -u -b -r1.199 -r1.200
  --- TreeCache.java	18 Jul 2006 10:50:46 -0000	1.199
  +++ TreeCache.java	18 Jul 2006 18:28:39 -0000	1.200
  @@ -13,6 +13,7 @@
   import org.jboss.cache.buddyreplication.BuddyManager;
   import org.jboss.cache.config.CacheLoaderConfig;
   import org.jboss.cache.config.Option;
  +import org.jboss.cache.config.Configuration;
   import org.jboss.cache.eviction.EvictionPolicy;
   import org.jboss.cache.factories.InterceptorChainFactory;
   import org.jboss.cache.factories.NodeFactory;
  @@ -79,7 +80,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.199 2006/07/18 10:50:46 msurtani Exp $
  + * @version $Id: TreeCache.java,v 1.200 2006/07/18 18:28:39 msurtani Exp $
    *          <p/>
    * @see <a href="http://labs.jboss.com/portal/jbosscache/docs">JBossCache doc</a>
    */
  @@ -99,7 +100,7 @@
      /**
       * Root DataNode.
       */
  -   protected DataNode root = NodeFactory.getInstance().createRootDataNode(NodeFactory.NODE_TYPE_TREENODE, this);
  +   public DataNode root = NodeFactory.getInstance().createRootDataNode(NodeFactory.NODE_TYPE_TREENODE, this);
   
      /**
       * Set of TreeCacheListener.
  @@ -398,6 +399,14 @@
       * will be ignored by _getState().
       */
      protected final Set activationChangeNodes = new HashSet();
  +    boolean started;
  +
  +    public Configuration getConfiguration()
  +    {
  +        return configuration;
  +    }
  +
  +    private Configuration configuration;
   
      /**
       * Creates a channel with the given cluster name, properties, and state fetch timeout.
  @@ -1451,6 +1460,7 @@
   
         coordinator = determineCoordinator();
         notifyCacheStarted();
  +      started = true;
      }
   
      /**
  @@ -1513,6 +1523,7 @@
         evictionPolicyListener = null;
   
         useCreateService = false;
  +      started = false;
      }
   
      /* ----------------------- End of MBeanSupport ----------------------- */
  @@ -5239,6 +5250,11 @@
         this.cacheLoaderManager = cacheLoaderManager;
      }
   
  +    public void setConfiguration(Configuration configuration)
  +    {
  +        this.configuration = configuration;
  +    }
  +
      /*-------------------- MessageListener ----------------------*/
   
      class MessageListenerAdaptor implements MessageListener
  
  
  
  1.2       +1 -2      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.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- TreeCacheProxyImpl.java	18 Jul 2006 10:50:46 -0000	1.1
  +++ TreeCacheProxyImpl.java	18 Jul 2006 18:28:39 -0000	1.2
  @@ -29,7 +29,6 @@
    */
   public class TreeCacheProxyImpl implements CacheSPI, NodeSPI
   {
  -    Configuration config;
       TreeCache treeCache;
       NodeImpl currentNode;
   
  @@ -41,7 +40,7 @@
   
       public Configuration getConfiguration()
       {
  -        return config;
  +        return treeCache.getConfiguration();
       }
   
       public List<Interceptor> getInterceptorChain()