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

[Manik Surtani]

  User: msurtani
  Date: 06/07/19 17:34:44

  Modified:    src/org/jboss/cache/statetransfer  
                        StateTransferFactory.java
                        StateTransferIntegrator_200.java
  Log:
  JBCACHE-657
  JBCACHE-594
  
  Revision  Changes    Path
  1.7       +4 -4      JBossCache/src/org/jboss/cache/statetransfer/StateTransferFactory.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: StateTransferFactory.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/statetransfer/StateTransferFactory.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- StateTransferFactory.java	18 Jul 2006 21:19:35 -0000	1.6
  +++ StateTransferFactory.java	19 Jul 2006 21:34:44 -0000	1.7
  @@ -6,14 +6,14 @@
    */
   package org.jboss.cache.statetransfer;
   
  -import java.io.ByteArrayInputStream;
  -import java.io.IOException;
  -
   import org.jboss.cache.Fqn;
   import org.jboss.cache.TreeCache;
   import org.jboss.cache.Version;
   import org.jboss.invocation.MarshalledValueInputStream;
   
  +import java.io.ByteArrayInputStream;
  +import java.io.IOException;
  +
   public abstract class StateTransferFactory
   {
      private static final short RV_200 = Version.getVersionShort("2.0.0");
  @@ -30,7 +30,7 @@
      public static StateTransferGenerator 
            getStateTransferGenerator(TreeCache cache)
      {
  -      short version = cache.getReplicationVersionShort();
  +      short version = cache.getConfiguration().getReplicationVersion();
         
         // Compiler won't let me use a switch
         
  
  
  
  1.3       +2 -2      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.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- StateTransferIntegrator_200.java	19 Jul 2006 08:29:18 -0000	1.2
  +++ StateTransferIntegrator_200.java	19 Jul 2006 21:34:44 -0000	1.3
  @@ -59,7 +59,7 @@
         this.cache     = cache;
         this.state      = state;
         this.factory = NodeFactory.getInstance();
  -      this.nodeType = cache.isNodeLockingOptimistic() 
  +      this.nodeType = cache.getConfiguration().isNodeLockingOptimistic() 
                                       ? NodeFactory.NODE_TYPE_OPTIMISTIC_NODE 
                                       : NodeFactory.NODE_TYPE_TREENODE;
         this.internalFqns = cache.getInternalFqns();