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

[Brian Stansberry]

  User: bstansberry
  Date: 06/07/20 17:58:21

  Modified:    src/org/jboss/cache/loader  LocalDelegatingCacheLoader.java
  Log:
  [JBCACHE-465] Extract the state transfer code out of TreeCache
  
  Revision  Changes    Path
  1.9       +23 -3     JBossCache/src/org/jboss/cache/loader/LocalDelegatingCacheLoader.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: LocalDelegatingCacheLoader.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/loader/LocalDelegatingCacheLoader.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- LocalDelegatingCacheLoader.java	19 Jul 2006 08:29:18 -0000	1.8
  +++ LocalDelegatingCacheLoader.java	20 Jul 2006 21:58:21 -0000	1.9
  @@ -26,7 +26,7 @@
    * </pre>
    * @author Bela Ban
    * @author Daniel Gredler
  - * @version $Id: LocalDelegatingCacheLoader.java,v 1.8 2006/07/19 08:29:18 msurtani Exp $
  + * @version $Id: LocalDelegatingCacheLoader.java,v 1.9 2006/07/20 21:58:21 bstansberry Exp $
    */
   public class LocalDelegatingCacheLoader extends DelegatingCacheLoader {
   
  @@ -124,7 +124,27 @@
       }
   
       protected byte[] delegateLoadEntireState() throws Exception {
  -       return delegate.getStateBytes();
  +       try
  +       {
  +//          // We use the lock acquisition timeout rather than the
  +//          // state transfer timeout, otherwise we'd never try
  +//          // to break locks before the requesting node gives up
  +//          return cache._getState(Fqn.fromString(SEPARATOR),
  +//             cache.getLockAcquisitionTimeout(),
  +//             true,
  +//             false);
  +          // Until flush is in place, use the old mechanism
  +          // where we wait the full state retrieval timeout
  +          return delegate.getStateTransferManager().getState(Fqn.ROOT, delegate.getConfiguration().getInitialStateRetrievalTimeout(), true, false);
  +       }
  +       catch (Exception e)
  +       {
  +          throw e;
  +       }
  +       catch (Throwable t)
  +       {
  +          throw new RuntimeException("Caught exception getting state from delegate", t);
  +       }
       }
   
       protected void delegateStoreState(byte[] state, Fqn fqn) throws Exception
  @@ -133,7 +153,7 @@
       }
   
       protected void delegateStoreEntireState(byte[] state) throws Exception {
  -       delegate.setStateBytes(state);
  +       delegate.getStateTransferManager().setState(state, Fqn.ROOT, null);
       }
   
   }