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

[Manik Surtani]

  User: msurtani
  Date: 06/08/24 10:47:17

  Modified:    src/org/jboss/cache  TreeCache.java
  Log:
  fixed state transfer detection
  
  Revision  Changes    Path
  1.224     +9 -2      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.223
  retrieving revision 1.224
  diff -u -b -r1.223 -r1.224
  --- TreeCache.java	22 Aug 2006 12:27:51 -0000	1.223
  +++ TreeCache.java	24 Aug 2006 14:47:17 -0000	1.224
  @@ -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.223 2006/08/22 12:27:51 msurtani Exp $
  + * @version $Id: TreeCache.java,v 1.224 2006/08/24 14:47:17 msurtani Exp $
    *          <p/>
    * @see <a href="http://labs.jboss.com/portal/jbosscache/docs">JBossCache doc</a>
    */
  @@ -649,6 +649,13 @@
         useCreateService = true;
      }
   
  +
  +    protected boolean shouldFetchStateOnStartup()
  +    {
  +        return !configuration.isInactiveOnStartup() && buddyManager == null && (configuration.isFetchInMemoryState() || (cacheLoaderManager != null && cacheLoaderManager.isFetchPersistentState()));
  +    }
  +
  +
      /**
       * Lifecyle method. This is the same thing as calling <code>start</code>
       *
  @@ -680,7 +687,7 @@
   
               if (log.isInfoEnabled())
                  log.info("TreeCache local address is " + channel.getLocalAddress());
  -            if (configuration.isFetchInMemoryState())
  +            if (shouldFetchStateOnStartup())
               {
                  fetchStateOnStartup();
               }