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

[Manik Surtani]

  User: msurtani
  Date: 06/08/30 13:08:18

  Modified:    src/org/jboss/cache/statetransfer  StateTransferManager.java
  Log:
  Java5 optimisations
  
  Revision  Changes    Path
  1.6       +71 -72    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.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- StateTransferManager.java	25 Aug 2006 14:10:09 -0000	1.5
  +++ StateTransferManager.java	30 Aug 2006 17:08:18 -0000	1.6
  @@ -1,12 +1,5 @@
   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;
  @@ -17,19 +10,26 @@
   import org.jboss.cache.loader.CacheLoaderManager;
   import org.jboss.cache.loader.NodeData;
   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
   {
      protected final static Log log = LogFactory.getLog(StateTransferManager.class);
   
  -   public static final NodeData STREAMING_DELIMETER_NODE = new NodeData(Fqn.fromString("STREAMING_DELIMETER_NODE"),null);
  +   public static final NodeData STREAMING_DELIMETER_NODE = new NodeData(Fqn.fromString("STREAMING_DELIMETER_NODE"), null);
      
      private TreeCache treeCache;
  -   private long[] loadStateTimeouts =  { 400, 800, 1200 };
  +   private long[] loadStateTimeouts = {400, 800, 1200};
      
      public StateTransferManager(TreeCache cache)
      {
  @@ -78,9 +78,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;
  @@ -149,7 +149,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);
      }
      
      /**
  @@ -189,14 +189,13 @@
            Boolean force = (i == timeouts.length - 1) ? Boolean.TRUE
               : Boolean.FALSE;
   
  -         MethodCall psmc = MethodCallFactory.create(MethodDeclarations.getPartialStateMethod,
  -            new Object[]{subtreeRoot,
  -               new Long(timeouts[i]),
  +         MethodCall psmc = MethodCallFactory.create(MethodDeclarations.getPartialStateMethod, subtreeRoot,
  +                 timeouts[i],
                  force,
  -               Boolean.FALSE});
  +                 Boolean.FALSE);
   
            MethodCall replPsmc = MethodCallFactory.create(MethodDeclarations.replicateMethod,
  -            new Object[]{psmc});
  +                 psmc);
   
            // Iterate over the group members, seeing if anyone
            // can give us state for this region
  @@ -330,7 +329,7 @@
         
         byte [] new_state = null;
         InputStream istream = null;
  -      if(state instanceof byte[])
  +      if (state instanceof byte[])
         {
            new_state = (byte[]) state;     
            log.info("received the state (size=" + new_state.length + " bytes)");
  @@ -348,10 +347,10 @@
                                         getTreeCache().getConfiguration().getInitialStateRetrievalTimeout(),
                                         true, true);
   
  -         StateTransferIntegrator integrator =null;
  -         if(new_state!=null)
  +         StateTransferIntegrator integrator = null;
  +         if (new_state != null)
            {         
  -            integrator = getStateTransferIntegrator(new_state,targetRoot.getFqn());
  +            integrator = getStateTransferIntegrator(new_state, targetRoot.getFqn());
            }
            else
            {
  @@ -445,7 +444,7 @@
      
      protected StateTransferGenerator getStateTransferGenerator(OutputStream os)
      {
  -      return StateTransferFactory.getStateTransferGenerator(os,getTreeCache());
  +      return StateTransferFactory.getStateTransferGenerator(os, getTreeCache());
      }
      
      protected StateTransferIntegrator getStateTransferIntegrator(byte[] state, Fqn targetFqn)