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

[Manik Surtani]

  User: msurtani
  Date: 07/03/12 14:13:48

  Modified:    src/org/jboss/cache/statetransfer  
                        DefaultStateTransferIntegrator.java
                        DefaultStateTransferGenerator.java
  Log:
  JBCACHE-1005
  
  Revision  Changes    Path
  1.23      +9 -10     JBossCache/src/org/jboss/cache/statetransfer/DefaultStateTransferIntegrator.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: DefaultStateTransferIntegrator.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/statetransfer/DefaultStateTransferIntegrator.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -b -r1.22 -r1.23
  --- DefaultStateTransferIntegrator.java	30 Jan 2007 01:22:55 -0000	1.22
  +++ DefaultStateTransferIntegrator.java	12 Mar 2007 18:13:48 -0000	1.23
  @@ -30,7 +30,6 @@
   import java.util.List;
   import java.util.Map;
   import java.util.Set;
  -import java.util.Collections;
   
   public class DefaultStateTransferIntegrator implements StateTransferIntegrator
   {
  @@ -317,7 +316,7 @@
            // change the Fqn to fit under it
            if (offset > 0)
            {
  -            fqn = new Fqn(parent.getFqn().getFqnChild(offset), fqn);
  +            fqn = new Fqn(parent.getFqn().getAncestor(offset), fqn);
            }
            size = fqn.size();
            if (size <= parent_level)
  
  
  
  1.17      +2 -2      JBossCache/src/org/jboss/cache/statetransfer/DefaultStateTransferGenerator.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: DefaultStateTransferGenerator.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/statetransfer/DefaultStateTransferGenerator.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -b -r1.16 -r1.17
  --- DefaultStateTransferGenerator.java	17 Jan 2007 14:13:06 -0000	1.16
  +++ DefaultStateTransferGenerator.java	12 Mar 2007 18:13:48 -0000	1.17
  @@ -140,14 +140,14 @@
         cache.getMarshaller().objectToObjectStream(nodeData, out, node.getFqn());
      }
   
  -   protected void generateNodeDataList(NodeSPI node, List<NodeData> list) throws Exception
  +   protected void generateNodeDataList(NodeSPI<?, ?> node, List<NodeData> list) throws Exception
      {
         if (internalFqns.contains(node.getFqn()))
         {
            return;
         }
   
  -      Map<Object, Object> attrs;
  +      Map attrs;
         NodeData nd;
   
         // first handle the current node