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

[Manik Surtani]

  User: msurtani
  Date: 07/05/25 08:38:26

  Modified:    src/org/jboss/cache/interceptors 
                        DataGravitatorInterceptor.java
  Log:
  Context overriding in DGI
  
  Revision  Changes    Path
  1.43      +7 -3      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.42
  retrieving revision 1.43
  diff -u -b -r1.42 -r1.43
  --- DataGravitatorInterceptor.java	23 May 2007 15:22:03 -0000	1.42
  +++ DataGravitatorInterceptor.java	25 May 2007 12:38:26 -0000	1.43
  @@ -112,6 +112,10 @@
                        log.trace("Passing the put call locally to make sure state is persisted and ownership is correctly established.");
                        createNode(data.backupData, false);
   
  +                     // very strange, the invocation contexts get twisted up here, and will need preservation.
  +                     // a bit crappy and hacky, all will be solved when we move to JBoss AOP in 2.1.0
  +                     ctx.setMethodCall(m);
  +
                        // Clean up the other nodes
                        cleanBackupData(data, ctx.getGlobalTransaction());
                     }
  @@ -315,7 +319,7 @@
         List<Address> mbrs = cache.getMembers();
         Boolean searchSubtrees = (buddyManager.isDataGravitationSearchBackupTrees() ? Boolean.TRUE : Boolean.FALSE);
         MethodCall dGrav = MethodCallFactory.create(MethodDeclarations.dataGravitationMethod, fqn, searchSubtrees);
  -      List resps = cache.getRPCManager().callRemoteMethods(mbrs, dGrav, GroupRequest.GET_FIRST, true, buddyManager.getBuddyCommunicationTimeout());
  +      List resps = cache.getRPCManager().callRemoteMethods(mbrs, dGrav, GroupRequest.GET_ALL, true, buddyManager.getBuddyCommunicationTimeout());
         if (log.isTraceEnabled())
         {
            log.trace("got responses " + resps);
  @@ -366,7 +370,7 @@
            {
               if (cache.peek(data.getFqn(), false) == null)
               {
  -               createNodes(data.getFqn(), data.getAttributes());
  +               createNodesLocally(data.getFqn(), data.getAttributes());
               }
            }
            else
  @@ -376,7 +380,7 @@
         }
      }
   
  -   private void createNodes(Fqn fqn, Map data) throws CacheException
  +   private void createNodesLocally(Fqn fqn, Map data) throws CacheException
      {
         int treeNodeSize;
         if ((treeNodeSize = fqn.size()) == 0) return;