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

[Manik Surtani]

  User: msurtani
  Date: 06/07/19 04:29:18

  Modified:    src/org/jboss/cache/statetransfer  
                        StateTransferGenerator_200.java
                        StateTransferIntegrator_200.java
  Log:
  Migration to new CacheLoader interface
  
  Revision  Changes    Path
  1.2       +8 -10     JBossCache/src/org/jboss/cache/statetransfer/StateTransferGenerator_200.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: StateTransferGenerator_200.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/statetransfer/StateTransferGenerator_200.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- StateTransferGenerator_200.java	18 Jul 2006 21:19:35 -0000	1.1
  +++ StateTransferGenerator_200.java	19 Jul 2006 08:29:18 -0000	1.2
  @@ -6,13 +6,6 @@
    */
   package org.jboss.cache.statetransfer;
   
  -import java.io.IOException;
  -import java.io.ObjectOutputStream;
  -import java.io.OutputStream;
  -import java.util.Iterator;
  -import java.util.Map;
  -import java.util.Set;
  -
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   import org.jboss.cache.DataNode;
  @@ -22,11 +15,17 @@
   import org.jboss.cache.aop.InternalDelegate;
   import org.jboss.cache.aop.PojoCache;
   import org.jboss.cache.aop.util.ObjectUtil;
  -import org.jboss.cache.loader.ExtendedCacheLoader;
   import org.jboss.cache.loader.NodeData;
   import org.jboss.cache.util.ExposedByteArrayOutputStream;
   import org.jboss.invocation.MarshalledValueOutputStream;
   
  +import java.io.IOException;
  +import java.io.ObjectOutputStream;
  +import java.io.OutputStream;
  +import java.util.Iterator;
  +import java.util.Map;
  +import java.util.Set;
  +
   class StateTransferGenerator_200 implements StateTransferGenerator
   {
      public static final short STATE_TRANSFER_VERSION = 
  @@ -126,7 +125,7 @@
               if (fqn.size() == 0)
                  persState = cache.getCacheLoader().loadEntireState();
               else
  -               persState = ((ExtendedCacheLoader)cache.getCacheLoader()).loadState(fqn);
  +               persState = cache.getCacheLoader().loadState(fqn);
               
               if (persState != null) {
                  sizes[2] = persState.length;
  @@ -182,7 +181,6 @@
   
      /**
       * Do a preorder traversal: visit the node first, then the node's children
  -    * @param fqn Start node
       * @param out
       * @throws Exception
       */
  
  
  
  1.2       +13 -18    JBossCache/src/org/jboss/cache/statetransfer/StateTransferIntegrator_200.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: StateTransferIntegrator_200.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/statetransfer/StateTransferIntegrator_200.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- StateTransferIntegrator_200.java	18 Jul 2006 21:19:35 -0000	1.1
  +++ StateTransferIntegrator_200.java	19 Jul 2006 08:29:18 -0000	1.2
  @@ -6,30 +6,29 @@
    */
   package org.jboss.cache.statetransfer;
   
  -import java.io.ByteArrayInputStream;
  -import java.io.EOFException;
  -import java.io.IOException;
  -import java.io.ObjectInputStream;
  -import java.util.HashSet;
  -import java.util.Iterator;
  -import java.util.Map;
  -import java.util.Set;
  -
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   import org.jboss.cache.DataNode;
   import org.jboss.cache.Fqn;
  -import org.jboss.cache.TreeNode;
   import org.jboss.cache.TreeCache;
  +import org.jboss.cache.TreeNode;
   import org.jboss.cache.aop.InternalDelegate;
   import org.jboss.cache.aop.PojoCache;
  +import org.jboss.cache.buddyreplication.BuddyManager;
   import org.jboss.cache.factories.NodeFactory;
   import org.jboss.cache.loader.CacheLoader;
  -import org.jboss.cache.loader.ExtendedCacheLoader;
   import org.jboss.cache.loader.NodeData;
  -import org.jboss.cache.buddyreplication.BuddyManager;
   import org.jboss.invocation.MarshalledValueInputStream;
   
  +import java.io.ByteArrayInputStream;
  +import java.io.EOFException;
  +import java.io.IOException;
  +import java.io.ObjectInputStream;
  +import java.util.HashSet;
  +import java.util.Iterator;
  +import java.util.Map;
  +import java.util.Set;
  +
   class StateTransferIntegrator_200 implements StateTransferIntegrator
   {
      /** Number of bytes at the beginning of the state transfer byte[]
  @@ -176,20 +175,16 @@
               if (log.isTraceEnabled())
                  log.trace("setting the persistent state was successful");
            }
  -         else if (loader instanceof ExtendedCacheLoader) {
  +         else {
               if (log.isTraceEnabled())
                  log.trace("setting the persistent state");
               // cache_loader.remove(Fqn.fromString("/"));
               byte[] persistentState = getPersistentState();
  -            ((ExtendedCacheLoader) loader).storeState(persistentState, 
  +            loader.storeState(persistentState, 
                                                         targetFqn);
               if (log.isTraceEnabled())
                  log.trace("setting the persistent state was successful");
            }            
  -         else {
  -            log.error("cache loader does not implement ExtendedCacheLoader, " +
  -                      "cannot set persistent state");
  -         }
         }
      }