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

[Manik Surtani]

  User: msurtani
  Date: 06/09/11 13:02:43

  Modified:    src/org/jboss/cache/statetransfer  StateTransferManager.java
  Log:
  - fixed Data Gravitation interceptor breakages
  - correctly implemented cache.gravidateData()
  - set DummyTM in buddy-replication-service.xml
  
  Revision  Changes    Path
  1.10      +71 -73    JBossCache/src/org/jboss/cache/statetransfer/StateTransferManager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: StateTransferManager.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/statetransfer/StateTransferManager.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- StateTransferManager.java	6 Sep 2006 15:34:13 -0000	1.9
  +++ StateTransferManager.java	11 Sep 2006 17:02:43 -0000	1.10
  @@ -6,28 +6,27 @@
    */
   package org.jboss.cache.statetransfer;
   
  -import java.io.InputStream;
  -import java.io.OutputStream;
  -import java.util.Iterator;
  -import java.util.List;
  -import java.util.Map;
  -import java.util.Vector;
  -
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   import org.jboss.cache.CacheException;
   import org.jboss.cache.DataNode;
   import org.jboss.cache.Fqn;
   import org.jboss.cache.TreeCache;
  -import org.jboss.cache.config.Option;
   import org.jboss.cache.loader.CacheLoaderManager;
   import org.jboss.cache.loader.NodeData;
   import org.jboss.cache.loader.NodeDataMarker;
   import org.jboss.cache.lock.TimeoutException;
  +import org.jboss.cache.marshall.MethodCall;
   import org.jboss.cache.marshall.MethodCallFactory;
   import org.jboss.cache.marshall.MethodDeclarations;
   import org.jboss.cache.marshall.VersionAwareMarshaller;
  -import org.jboss.cache.marshall.MethodCall;
  +
  +import java.io.InputStream;
  +import java.io.OutputStream;
  +import java.util.Iterator;
  +import java.util.List;
  +import java.util.Map;
  +import java.util.Vector;
   
   public class StateTransferManager
   {
  @@ -36,7 +35,7 @@
      public static final NodeData STREAMING_DELIMETER_NODE = new NodeDataMarker();
      
      private TreeCache treeCache;
  -   private long[] loadStateTimeouts =  { 400, 800, 1200 };
  +   private long[] loadStateTimeouts = {400, 800, 1200};
      
      public StateTransferManager(TreeCache cache)
      {
  @@ -85,9 +84,9 @@
       *                                       enabled, the requested Fqn is not the root node, and the
       *                                       cache loader does not implement {@link ExtendedCacheLoader}.
       */
  -   public byte[] getState(OutputStream os,Fqn fqn, long timeout, boolean force, boolean suppressErrors) throws Throwable
  +   public byte[] getState(OutputStream os, Fqn fqn, long timeout, boolean force, boolean suppressErrors) throws Throwable
      {
  -      boolean usingStreamingStateTransfer = os!=null;
  +      boolean usingStreamingStateTransfer = os != null;
         TreeCache cache = getTreeCache();
         
         VersionAwareMarshaller marshaller_ = null;
  @@ -156,7 +155,7 @@
      
      public byte[] getState(Fqn fqn, long timeout, boolean force, boolean suppressErrors) throws Throwable
      {
  -      return getState(null,fqn,timeout,force,suppressErrors);
  +      return getState(null, fqn, timeout, force, suppressErrors);
      }
      
      /**
  @@ -300,9 +299,8 @@
         if (target == null)
         {
            // Create the integration root, but do not replicate
  -         Option option = new Option();
  -         option.setCacheModeLocal(true);
  -         cache.put(targetRoot, null, option);
  +         cache.getInvocationContext().getOptionOverrides().setCacheModeLocal(true);
  +         cache.put(targetRoot, null);
            target = cache.findNode(targetRoot);
         }
         
  @@ -334,7 +332,7 @@
            return;
         }
               
  -      boolean usingStreamTransfer = (state instanceof InputStream)?true:false;     
  +      boolean usingStreamTransfer = (state instanceof InputStream) ? true : false;
   
         Object owner = getOwnerForLock();
         try
  @@ -344,22 +342,22 @@
                                         getTreeCache().getConfiguration().getInitialStateRetrievalTimeout(),
                                         true, true);
   
  -         StateTransferIntegrator integrator =null;
  -         if(usingStreamTransfer)
  +         StateTransferIntegrator integrator = null;
  +         if (usingStreamTransfer)
            {
  -            integrator = getStateTransferIntegrator((InputStream)state,
  +            integrator = getStateTransferIntegrator((InputStream) state,
                     targetRoot.getFqn());
            }
            else
            {
               byte [] new_state = (byte[]) state;     
               log.info("received the state (size=" + new_state.length + " bytes)");
  -            integrator = getStateTransferIntegrator(new_state,targetRoot.getFqn());
  +            integrator = getStateTransferIntegrator(new_state, targetRoot.getFqn());
            }         
            
            try
            {
  -            log.info("starting state integration at node " +targetRoot + " using " + integrator);
  +            log.info("starting state integration at node " + targetRoot + " using " + integrator);
               integrator.integrateState(targetRoot, cl); 
               log.info("successfully integrated state");
            }
  @@ -440,7 +438,7 @@
      
      protected StateTransferGenerator getStateTransferGenerator(OutputStream os)
      {
  -      return StateTransferFactory.getStateTransferGenerator(os,getTreeCache());
  +      return StateTransferFactory.getStateTransferGenerator(os, getTreeCache());
      }
      
      protected StateTransferIntegrator getStateTransferIntegrator(byte[] state, Fqn targetFqn)