[jbosscache-commits] JBoss Cache SVN: r5553 - core/trunk/src/main/java/org/jboss/cache/commands/cachedata.

[jbosscache-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2008-04-14 10:50:03 -0400 (Mon, 14 Apr 2008)
New Revision: 5553

Modified:
   core/trunk/src/main/java/org/jboss/cache/commands/cachedata/InvalidateCommand.java
   core/trunk/src/main/java/org/jboss/cache/commands/cachedata/PutDataMapCommand.java
Log:
Added method ids

Modified: core/trunk/src/main/java/org/jboss/cache/commands/cachedata/InvalidateCommand.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/cachedata/InvalidateCommand.java	2008-04-14 14:49:47 UTC (rev 5552)
+++ core/trunk/src/main/java/org/jboss/cache/commands/cachedata/InvalidateCommand.java	2008-04-14 14:50:03 UTC (rev 5553)
@@ -2,7 +2,12 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.jboss.cache.*;
+import org.jboss.cache.CacheException;
+import org.jboss.cache.CacheSPI;
+import org.jboss.cache.Fqn;
+import org.jboss.cache.InvocationContext;
+import org.jboss.cache.Node;
+import org.jboss.cache.NodeSPI;
 import org.jboss.cache.commands.CommandsVisitor;
 import org.jboss.cache.config.Option;
 import org.jboss.cache.factories.annotations.Inject;
@@ -30,6 +35,8 @@
  */
 public class InvalidateCommand extends EvictFqnCommand
 {
+   public static final int METHOD_ID = 47;
+
    private static final Log log = LogFactory.getLog(InvalidateCommand.class);
 
    /* dependencies*/
@@ -145,8 +152,29 @@
       return handler.handleInvalidateCommand(ctx, this);
    }
 
-   public DataVersion getVersionToInvalidate()
+   @Override
+   public boolean isVersioned()
    {
-      return dataVersion;
+      // invalidate commands are *always* versioned.
+      return true;
    }
+
+   @Override
+   public int getCommandId()
+   {
+      return METHOD_ID;
+   }
+
+   @Override
+   public Object[] getParameters()
+   {
+      return new Object[]{fqn, dataVersion};
+   }
+
+   @Override
+   public void setState(int commandId, Object[] args)
+   {
+      fqn = (Fqn) args[0];
+      dataVersion = (DataVersion) args[1];
+   }
 }

Modified: core/trunk/src/main/java/org/jboss/cache/commands/cachedata/PutDataMapCommand.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/cachedata/PutDataMapCommand.java	2008-04-14 14:49:47 UTC (rev 5552)
+++ core/trunk/src/main/java/org/jboss/cache/commands/cachedata/PutDataMapCommand.java	2008-04-14 14:50:03 UTC (rev 5553)
@@ -7,9 +7,9 @@
 import org.jboss.cache.NodeSPI;
 import org.jboss.cache.commands.BaseCommand;
 import org.jboss.cache.commands.CommandsVisitor;
+import org.jboss.cache.commands.functional.TxCacheCommand;
 import org.jboss.cache.commands.state.DataVersionCommand;
 import org.jboss.cache.commands.state.GlobalTransactionCommand;
-import org.jboss.cache.commands.functional.TxCacheCommand;
 import org.jboss.cache.factories.annotations.Inject;
 import org.jboss.cache.invocation.CacheData;
 import org.jboss.cache.notifications.Notifier;
@@ -30,6 +30,8 @@
 {
    public static final int METHOD_ID = 1;
    public static final int ERASE_METHOD_ID = 2;
+   public static final int VERSIONED_METHOD_ID = 37;
+   public static final int ERASE_VERSIONED_METHOD_ID = 38;
 
    private static Log log = LogFactory.getLog(PutDataMapCommand.class);
 
@@ -162,12 +164,22 @@
 
    public int getCommandId()
    {
-      return eraseContents ? ERASE_METHOD_ID : METHOD_ID;
+      if (isVersioned())
+      {
+         return eraseContents ? ERASE_VERSIONED_METHOD_ID : VERSIONED_METHOD_ID;
+      }
+      else
+      {
+         return eraseContents ? ERASE_METHOD_ID : METHOD_ID;
+      }
    }
 
    public Object[] getParameters()
    {
-      return new Object[]{globalTransaction, fqn, data, createUndoOps};
+      if (isVersioned())
+         return new Object[]{globalTransaction, fqn, data, createUndoOps, dataVersion};
+      else
+         return new Object[]{globalTransaction, fqn, data, createUndoOps};
    }
 
    public void setState(int commandId, Object[] args)
@@ -177,5 +189,7 @@
       data = (Map) args[2];
       createUndoOps = (Boolean) args[3];
       eraseContents = commandId == ERASE_METHOD_ID;
+      if (commandId == VERSIONED_METHOD_ID || commandId == ERASE_VERSIONED_METHOD_ID)
+         dataVersion = (DataVersion) args[4];
    }
 }