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

[Manik Surtani]

  User: msurtani
  Date: 07/03/17 15:11:03

  Modified:    src/org/jboss/cache/interceptors   
                        OptimisticNodeInterceptor.java
                        OptimisticReplicationInterceptor.java
                        DataGravitatorInterceptor.java
  Log:
  Ported fixes relating to releasing 1.4.1.SP3 to HEAD.
  
  Revision  Changes    Path
  1.57      +10 -0     JBossCache/src/org/jboss/cache/interceptors/OptimisticNodeInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: OptimisticNodeInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/OptimisticNodeInterceptor.java,v
  retrieving revision 1.56
  retrieving revision 1.57
  diff -u -b -r1.56 -r1.57
  --- OptimisticNodeInterceptor.java	12 Mar 2007 19:06:43 -0000	1.56
  +++ OptimisticNodeInterceptor.java	17 Mar 2007 19:11:03 -0000	1.57
  @@ -99,6 +99,11 @@
            Fqn fqn = getFqn(args);
            WorkspaceNode workspaceNode = getOrCreateWorkspaceNode(fqn, workspace, true);
   
  +         // in the case of a data gravitation cleanup, if the primary Fqn does not exist the backup one may.
  +         if (workspaceNode == null && m.getMethodId() == MethodDeclarations.dataGravitationCleanupMethod_id)
  +         {
  +            workspaceNode = getOrCreateWorkspaceNode(getBackupFqn(args), workspace, true);
  +         }
   
            if (workspaceNode != null)
            {
  @@ -212,6 +217,11 @@
         return result;
      }
   
  +   private Fqn getBackupFqn(Object[] args)
  +   {
  +      return (Fqn) args[2];
  +   }
  +
      private void addToModificationList(GlobalTransaction gtx, MethodCall m)
      {
         Option opt = cache.getInvocationContext().getOptionOverrides();
  
  
  
  1.34      +9 -9      JBossCache/src/org/jboss/cache/interceptors/OptimisticReplicationInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: OptimisticReplicationInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/OptimisticReplicationInterceptor.java,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -b -r1.33 -r1.34
  --- OptimisticReplicationInterceptor.java	7 Feb 2007 22:06:41 -0000	1.33
  +++ OptimisticReplicationInterceptor.java	17 Mar 2007 19:11:03 -0000	1.34
  @@ -76,7 +76,7 @@
                  // pass up the chain.
                  retval = super.invoke(m);
   
  -               if (!gtx.isRemote())
  +               if (!gtx.isRemote() && ctx.isOriginLocal())
                  {
                     // replicate the prepare call.
                     retval = broadcastPrepare(m, gtx);
  @@ -90,7 +90,7 @@
               case MethodDeclarations.commitMethod_id:
                  //lets broadcast the commit first
                  Throwable temp = null;
  -               if (!gtx.isRemote() && broadcastTxs.containsKey(gtx))
  +               if (!gtx.isRemote() && ctx.isOriginLocal() && broadcastTxs.containsKey(gtx))
                  {
                     //we dont do anything
                     try
  @@ -113,7 +113,7 @@
               case MethodDeclarations.rollbackMethod_id:
                  //    lets broadcast the rollback first
                  Throwable temp2 = null;
  -               if (!gtx.isRemote() && broadcastTxs.containsKey(gtx))
  +               if (!gtx.isRemote() && ctx.isOriginLocal() && broadcastTxs.containsKey(gtx))
                  {
                     //we dont do anything
                     try
  
  
  
  1.41      +2 -5      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.40
  retrieving revision 1.41
  diff -u -b -r1.40 -r1.41
  --- DataGravitatorInterceptor.java	7 Feb 2007 22:06:40 -0000	1.40
  +++ DataGravitatorInterceptor.java	17 Mar 2007 19:11:03 -0000	1.41
  @@ -23,15 +23,12 @@
   import org.jboss.cache.marshall.NodeData;
   import org.jboss.cache.transaction.GlobalTransaction;
   import org.jboss.cache.transaction.TransactionEntry;
  -import org.jboss.util.stream.MarshalledValueInputStream;
   import org.jgroups.Address;
   import org.jgroups.blocks.GroupRequest;
   
  -import java.io.ByteArrayInputStream;
   import java.util.ArrayList;
   import java.util.Collection;
   import java.util.Collections;
  -import java.util.Iterator;
   import java.util.List;
   import java.util.Map;
   import java.util.concurrent.ConcurrentHashMap;
  @@ -82,7 +79,7 @@
         // Transactional lifecycle methods should be handled regardless of whether data gravitation is enabled or not.
         if (!MethodDeclarations.isTransactionLifecycleMethod(m.getMethodId()))
         {
  -         if (isGravitationEnabled(cache.getInvocationContext()))
  +         if (isGravitationEnabled(cache.getInvocationContext()) && MethodDeclarations.isGetMethod(m.getMethodId()))
            {
               // test that the Fqn being requested exists locally in the cache.
               Fqn fqn = extractFqn(m.getMethodId(), m.getArgs());