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

[Manik Surtani]

  User: msurtani
  Date: 06/08/16 07:15:56

  Modified:    src/org/jboss/cache  TreeCache.java
  Log:
  Certain configs not being read properly, incorrect interceptor chain was generated.
  
  Revision  Changes    Path
  1.215     +12 -4     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.214
  retrieving revision 1.215
  diff -u -b -r1.214 -r1.215
  --- TreeCache.java	16 Aug 2006 10:52:51 -0000	1.214
  +++ TreeCache.java	16 Aug 2006 11:15:56 -0000	1.215
  @@ -74,7 +74,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.214 2006/08/16 10:52:51 msurtani Exp $
  + * @version $Id: TreeCache.java,v 1.215 2006/08/16 11:15:56 msurtani Exp $
    *          <p/>
    * @see <a href="http://labs.jboss.com/portal/jbosscache/docs">JBossCache doc</a>
    */
  @@ -234,6 +234,7 @@
      /** State transfer manager. Do not access this field directly -- use the getter */
      private StateTransferManager stateTransferManager;
      private Notifier notifier;
  +   private CacheSPI rootSpi;
   
       public StateTransferManager getStateTransferManager()
       {
  @@ -572,6 +573,10 @@
          notifier = new Notifier();
          stateFetchTimeout = configuration.getLockAcquisitionTimeout() + 5000;
          if (configuration.isNodeLockingOptimistic()) root = NodeFactory.getInstance().createRootDataNode(NodeFactory.NODE_TYPE_OPTIMISTIC_NODE, this);
  +
  +       // prepare an SPI interface to the root node
  +       rootSpi = new TreeCacheProxyImpl(this, (NodeImpl) root);
  +
          setUseReplQueue(configuration.isUseReplQueue());
          setIsolationLevel(configuration.getIsolationLevel());
         if (this.tm_lookup == null && configuration.getTransactionManagerLookupClass() != null)
  @@ -782,8 +787,11 @@
            cacheLoaderManager.stopCacheLoader();
         }
   
  +       if (notifier != null)
  +       {
         notifier.notifyCacheStopped(getCacheSPI());
         notifier.removeAllCacheListeners();
  +       }
   
         useCreateService = false;
         started = false;
  @@ -4005,7 +4013,7 @@
   
       public CacheSPI getCacheSPI()
       {
  -        return new TreeCacheProxyImpl(this, (NodeImpl) root);
  +        return rootSpi;
       }