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

[Manik Surtani]

  User: msurtani
  Date: 07/01/15 11:19:10

  Modified:    src/org/jboss/cache/interceptors 
                        DataGravitatorInterceptor.java
  Log:
  * JBCACHE-752
  * Refactored GravitationResult
  * Updated CacheMarshaller200 to marshall GravitateResults and NodeData
  * Moved NodeData (and related objects) to o.j.c.marshall pkg
  
  Revision  Changes    Path
  1.36      +7 -8      JBossCache/src/org/jboss/cache/interceptors/DataGravitatorInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: DataGravitatorInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/DataGravitatorInterceptor.java,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -b -r1.35 -r1.36
  --- DataGravitatorInterceptor.java	10 Jan 2007 18:35:10 -0000	1.35
  +++ DataGravitatorInterceptor.java	15 Jan 2007 16:19:10 -0000	1.36
  @@ -19,10 +19,10 @@
   import org.jboss.cache.buddyreplication.BuddyManager;
   import org.jboss.cache.buddyreplication.GravitateResult;
   import org.jboss.cache.config.Configuration;
  -import org.jboss.cache.loader.NodeData;
   import org.jboss.cache.marshall.MethodCall;
   import org.jboss.cache.marshall.MethodCallFactory;
   import org.jboss.cache.marshall.MethodDeclarations;
  +import org.jboss.cache.marshall.NodeData;
   import org.jboss.util.stream.MarshalledValueInputStream;
   import org.jgroups.Address;
   import org.jgroups.blocks.GroupRequest;
  @@ -325,8 +325,7 @@
         }
         List<Address> mbrs = cache.getMembers();
         Boolean searchSubtrees = (buddyManager.isDataGravitationSearchBackupTrees() ? Boolean.TRUE : Boolean.FALSE);
  -      Boolean marshal = configuration.isUseRegionBasedMarshalling() ? Boolean.TRUE : Boolean.FALSE;
  -      MethodCall dGrav = MethodCallFactory.create(MethodDeclarations.dataGravitationMethod, fqn, searchSubtrees, marshal);
  +      MethodCall dGrav = MethodCallFactory.create(MethodDeclarations.dataGravitationMethod, fqn, searchSubtrees);
         List resps = cache.getRPCManager().callRemoteMethods(mbrs, dGrav, GroupRequest.GET_FIRST, true, buddyManager.getBuddyCommunicationTimeout());
         if (resps == null)
         {
  @@ -452,14 +451,14 @@
   
      private BackupData localBackupGet(Fqn fqn) throws CacheException
      {
  -      GravitateResult result = cache.gravitateData(fqn, true, false);// a "local" gravitation
  -      boolean found = result.getDataFound();
  +      GravitateResult result = cache.gravitateData(fqn, true);// a "local" gravitation
  +      boolean found = result.isDataFound();
         BackupData data = null;
   
         if (found)
         {
  -         Fqn backupFqn = result.getBuddyBackupRegion();
  -         List nodeData = result.getSubtree();
  +         Fqn backupFqn = result.getBuddyBackupFqn();
  +         List nodeData = result.getNodeData();
            data = new BackupData(fqn, backupFqn, nodeData);
            // now the cleanup
            if (buddyManager.isDataGravitationRemoveOnFind())