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

[Manik Surtani]

  User: msurtani
  Date: 06/09/11 13:02:42

  Modified:    src/org/jboss/cache/interceptors 
                        DataGravitatorInterceptor.java
  Log:
  - fixed Data Gravitation interceptor breakages
  - correctly implemented cache.gravidateData()
  - set DummyTM in buddy-replication-service.xml
  
  Revision  Changes    Path
  1.25      +8 -9      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.24
  retrieving revision 1.25
  diff -u -b -r1.24 -r1.25
  --- DataGravitatorInterceptor.java	30 Aug 2006 17:08:18 -0000	1.24
  +++ DataGravitatorInterceptor.java	11 Sep 2006 17:02:42 -0000	1.25
  @@ -20,7 +20,6 @@
   import org.jboss.cache.TreeCacheProxyImpl;
   import org.jboss.cache.buddyreplication.BuddyManager;
   import org.jboss.cache.config.Configuration;
  -import org.jboss.cache.config.Option;
   import org.jboss.cache.loader.NodeData;
   import org.jboss.cache.marshall.MethodCall;
   import org.jboss.cache.marshall.MethodCallFactory;
  @@ -39,7 +38,7 @@
   /**
    * The Data Gravitator interceptor intercepts cache misses and attempts t gravitate data from other parts of the cluster.
    * <p/>
  - * Only used if Buddy Replication is enabled.  Also, the interceptor only kicks in if an {@link Option} is passed in to
  + * Only used if Buddy Replication is enabled.  Also, the interceptor only kicks in if an {@link org.jboss.cache.config.Option} is passed in to
    * force Data Gravitation for a specific invocation or if <b>autoDataGravitation</b> is set to <b>true</b> when configuring
    * Buddy Replication.
    * <p/>
  @@ -167,8 +166,7 @@
         {
            if (!buddyManager.isAutoDataGravitation())
            {
  -            Option opt = ctx.getOptionOverrides();
  -            enabled = (opt != null && opt.getForceDataGravitation());
  +            enabled = ctx.getOptionOverrides().getForceDataGravitation();
            }
         }
         return enabled;
  @@ -389,7 +387,9 @@
         for (int i = 0; i < treeNodeSize; i++)
         {
            Object child_name = fqn.get(i);
  +         cache.getInvocationContext().getOptionOverrides().setBypassInterceptorChain(true);
            Node child_node = n.addChild(new Fqn(child_name));
  +         cache.getInvocationContext().getOptionOverrides().setBypassInterceptorChain(false);
            if (child_node == null)
            {
               if (log.isTraceEnabled())
  @@ -435,8 +435,8 @@
   
      private BackupData localBackupGet(Fqn fqn) throws CacheException
      {
  -      List gravitatedData = cache._gravitateData(fqn, true, false); // a "local" gravitation
  -      boolean found = ((Boolean) gravitatedData.get(0)).booleanValue();
  +      List gravitatedData = ((TreeCacheProxyImpl) cache).gravitateData(fqn, true, false); // a "local" gravitation
  +      boolean found = (Boolean) gravitatedData.get(0);
         BackupData data = null;
   
         if (found)
  @@ -449,9 +449,8 @@
            {
               // Remove locally only; the remote call will
               // be broadcast later
  -            Option opt = new Option();
  -            opt.setCacheModeLocal(true);
  -            cache.remove(backupFqn, opt);
  +            cache.getInvocationContext().getOptionOverrides().setCacheModeLocal(true);
  +            cache.remove(backupFqn);
            }
            else
            {