[infinispan-commits] Infinispan SVN: r226 - in trunk/core/src/main/java/org/infinispan/commands: read and 3 other directories.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Thu May 7 10:14:17 EDT 2009
Author: manik.surtani at jboss.com
Date: 2009-05-07 10:14:17 -0400 (Thu, 07 May 2009)
New Revision: 226
Modified:
trunk/core/src/main/java/org/infinispan/commands/control/StateTransferControlCommand.java
trunk/core/src/main/java/org/infinispan/commands/read/GetKeyValueCommand.java
trunk/core/src/main/java/org/infinispan/commands/remote/ClusteredGetCommand.java
trunk/core/src/main/java/org/infinispan/commands/remote/MultipleRpcCommand.java
trunk/core/src/main/java/org/infinispan/commands/remote/SingleRpcCommand.java
trunk/core/src/main/java/org/infinispan/commands/tx/CommitCommand.java
trunk/core/src/main/java/org/infinispan/commands/tx/PrepareCommand.java
trunk/core/src/main/java/org/infinispan/commands/tx/RollbackCommand.java
trunk/core/src/main/java/org/infinispan/commands/write/ClearCommand.java
trunk/core/src/main/java/org/infinispan/commands/write/InvalidateCommand.java
trunk/core/src/main/java/org/infinispan/commands/write/InvalidateL1Command.java
trunk/core/src/main/java/org/infinispan/commands/write/PutKeyValueCommand.java
trunk/core/src/main/java/org/infinispan/commands/write/PutMapCommand.java
trunk/core/src/main/java/org/infinispan/commands/write/RemoveCommand.java
trunk/core/src/main/java/org/infinispan/commands/write/ReplaceCommand.java
Log:
Re-indexed command ids to remove legacy JBC numbering
Modified: trunk/core/src/main/java/org/infinispan/commands/control/StateTransferControlCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/control/StateTransferControlCommand.java 2009-05-07 14:13:31 UTC (rev 225)
+++ trunk/core/src/main/java/org/infinispan/commands/control/StateTransferControlCommand.java 2009-05-07 14:14:17 UTC (rev 226)
@@ -11,7 +11,7 @@
* @since 4.0
*/
public class StateTransferControlCommand implements ReplicableCommand {
- public static final int COMMAND_ID = 49;
+ public static final int COMMAND_ID = 15;
RpcManager rpcManager;
boolean enabled;
Modified: trunk/core/src/main/java/org/infinispan/commands/read/GetKeyValueCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/read/GetKeyValueCommand.java 2009-05-07 14:13:31 UTC (rev 225)
+++ trunk/core/src/main/java/org/infinispan/commands/read/GetKeyValueCommand.java 2009-05-07 14:14:17 UTC (rev 226)
@@ -35,7 +35,7 @@
* @since 4.0
*/
public class GetKeyValueCommand extends AbstractDataCommand {
- public static final byte COMMAND_ID = 26;
+ public static final byte COMMAND_ID = 4;
private static final Log log = LogFactory.getLog(GetKeyValueCommand.class);
private static final boolean trace = log.isTraceEnabled();
private CacheNotifier notifier;
Modified: trunk/core/src/main/java/org/infinispan/commands/remote/ClusteredGetCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/remote/ClusteredGetCommand.java 2009-05-07 14:13:31 UTC (rev 225)
+++ trunk/core/src/main/java/org/infinispan/commands/remote/ClusteredGetCommand.java 2009-05-07 14:14:17 UTC (rev 226)
@@ -41,7 +41,7 @@
*/
public class ClusteredGetCommand implements CacheRpcCommand {
- public static final byte COMMAND_ID = 22;
+ public static final byte COMMAND_ID = 3;
private static final Log log = LogFactory.getLog(ClusteredGetCommand.class);
private static final boolean trace = log.isTraceEnabled();
Modified: trunk/core/src/main/java/org/infinispan/commands/remote/MultipleRpcCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/remote/MultipleRpcCommand.java 2009-05-07 14:13:31 UTC (rev 225)
+++ trunk/core/src/main/java/org/infinispan/commands/remote/MultipleRpcCommand.java 2009-05-07 14:14:17 UTC (rev 226)
@@ -42,7 +42,7 @@
*/
public class MultipleRpcCommand extends BaseRpcCommand {
- public static final byte COMMAND_ID = 13;
+ public static final byte COMMAND_ID = 2;
private static final Log log = LogFactory.getLog(MultipleRpcCommand.class);
private static final boolean trace = log.isTraceEnabled();
Modified: trunk/core/src/main/java/org/infinispan/commands/remote/SingleRpcCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/remote/SingleRpcCommand.java 2009-05-07 14:13:31 UTC (rev 225)
+++ trunk/core/src/main/java/org/infinispan/commands/remote/SingleRpcCommand.java 2009-05-07 14:14:17 UTC (rev 226)
@@ -12,7 +12,7 @@
* @author Mircea.Markus at jboss.com
*/
public class SingleRpcCommand extends BaseRpcCommand {
- public static final int COMMAND_ID = 21;
+ public static final int COMMAND_ID = 1;
private static Log log = LogFactory.getLog(SingleRpcCommand.class);
private static boolean trace = log.isTraceEnabled();
Modified: trunk/core/src/main/java/org/infinispan/commands/tx/CommitCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/tx/CommitCommand.java 2009-05-07 14:13:31 UTC (rev 225)
+++ trunk/core/src/main/java/org/infinispan/commands/tx/CommitCommand.java 2009-05-07 14:14:17 UTC (rev 226)
@@ -32,7 +32,7 @@
* @since 4.0
*/
public class CommitCommand extends AbstractTransactionBoundaryCommand {
- public static final byte COMMAND_ID = 11;
+ public static final byte COMMAND_ID = 14;
public CommitCommand(GlobalTransaction gtx) {
this.gtx = gtx;
Modified: trunk/core/src/main/java/org/infinispan/commands/tx/PrepareCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/tx/PrepareCommand.java 2009-05-07 14:13:31 UTC (rev 225)
+++ trunk/core/src/main/java/org/infinispan/commands/tx/PrepareCommand.java 2009-05-07 14:14:17 UTC (rev 226)
@@ -41,7 +41,7 @@
* @since 4.0
*/
public class PrepareCommand extends AbstractTransactionBoundaryCommand {
- public static final byte COMMAND_ID = 10;
+ public static final byte COMMAND_ID = 12;
protected WriteCommand[] modifications;
protected Address localAddress;
@@ -144,7 +144,8 @@
if (onePhaseCommit != that.onePhaseCommit) return false;
if (localAddress != null ? !localAddress.equals(that.localAddress) : that.localAddress != null) return false;
- if (modifications != null ? !Arrays.equals(modifications, that.modifications) : that.modifications != null) return false;
+ if (modifications != null ? !Arrays.equals(modifications, that.modifications) : that.modifications != null)
+ return false;
return true;
}
Modified: trunk/core/src/main/java/org/infinispan/commands/tx/RollbackCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/tx/RollbackCommand.java 2009-05-07 14:13:31 UTC (rev 225)
+++ trunk/core/src/main/java/org/infinispan/commands/tx/RollbackCommand.java 2009-05-07 14:14:17 UTC (rev 226)
@@ -32,7 +32,7 @@
* @since 4.0
*/
public class RollbackCommand extends AbstractTransactionBoundaryCommand {
- public static final byte COMMAND_ID = 12;
+ public static final byte COMMAND_ID = 13;
public RollbackCommand(GlobalTransaction globalTransaction) {
this.gtx = globalTransaction;
Modified: trunk/core/src/main/java/org/infinispan/commands/write/ClearCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/write/ClearCommand.java 2009-05-07 14:13:31 UTC (rev 225)
+++ trunk/core/src/main/java/org/infinispan/commands/write/ClearCommand.java 2009-05-07 14:14:17 UTC (rev 226)
@@ -33,7 +33,7 @@
*/
public class ClearCommand implements WriteCommand {
private static final Object[] params = new Object[0];
- public static final byte COMMAND_ID = 17;
+ public static final byte COMMAND_ID = 5;
CacheNotifier notifier;
public ClearCommand() {
Modified: trunk/core/src/main/java/org/infinispan/commands/write/InvalidateCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/write/InvalidateCommand.java 2009-05-07 14:13:31 UTC (rev 225)
+++ trunk/core/src/main/java/org/infinispan/commands/write/InvalidateCommand.java 2009-05-07 14:14:17 UTC (rev 226)
@@ -37,7 +37,7 @@
* @since 4.0
*/
public class InvalidateCommand extends RemoveCommand {
- public static final int COMMAND_ID = 47;
+ public static final int COMMAND_ID = 6;
private static final Log log = LogFactory.getLog(InvalidateCommand.class);
private static final boolean trace = log.isTraceEnabled();
private Object[] keys;
Modified: trunk/core/src/main/java/org/infinispan/commands/write/InvalidateL1Command.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/write/InvalidateL1Command.java 2009-05-07 14:13:31 UTC (rev 225)
+++ trunk/core/src/main/java/org/infinispan/commands/write/InvalidateL1Command.java 2009-05-07 14:14:17 UTC (rev 226)
@@ -11,7 +11,7 @@
* @since 4.0
*/
public class InvalidateL1Command extends InvalidateCommand {
- public static final int COMMAND_ID = 48;
+ public static final int COMMAND_ID = 7;
private DistributionManager dm;
public InvalidateL1Command() {
Modified: trunk/core/src/main/java/org/infinispan/commands/write/PutKeyValueCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/write/PutKeyValueCommand.java 2009-05-07 14:13:31 UTC (rev 225)
+++ trunk/core/src/main/java/org/infinispan/commands/write/PutKeyValueCommand.java 2009-05-07 14:14:17 UTC (rev 226)
@@ -36,7 +36,7 @@
* @since 4.0
*/
public class PutKeyValueCommand extends AbstractDataCommand implements DataWriteCommand {
- public static final byte COMMAND_ID = 3;
+ public static final byte COMMAND_ID = 8;
Object value;
boolean putIfAbsent;
Modified: trunk/core/src/main/java/org/infinispan/commands/write/PutMapCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/write/PutMapCommand.java 2009-05-07 14:13:31 UTC (rev 225)
+++ trunk/core/src/main/java/org/infinispan/commands/write/PutMapCommand.java 2009-05-07 14:14:17 UTC (rev 226)
@@ -34,7 +34,7 @@
* @since 4.0
*/
public class PutMapCommand implements WriteCommand {
- public static final byte COMMAND_ID = 121;
+ public static final byte COMMAND_ID = 9;
Map<Object, Object> map;
CacheNotifier notifier;
Modified: trunk/core/src/main/java/org/infinispan/commands/write/RemoveCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/write/RemoveCommand.java 2009-05-07 14:13:31 UTC (rev 225)
+++ trunk/core/src/main/java/org/infinispan/commands/write/RemoveCommand.java 2009-05-07 14:14:17 UTC (rev 226)
@@ -38,7 +38,7 @@
public class RemoveCommand extends AbstractDataCommand implements DataWriteCommand {
private static final Log log = LogFactory.getLog(RemoveCommand.class);
private static final boolean trace = log.isTraceEnabled();
- public static final byte COMMAND_ID = 6;
+ public static final byte COMMAND_ID = 10;
protected CacheNotifier notifier;
boolean successful = true;
Modified: trunk/core/src/main/java/org/infinispan/commands/write/ReplaceCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/write/ReplaceCommand.java 2009-05-07 14:13:31 UTC (rev 225)
+++ trunk/core/src/main/java/org/infinispan/commands/write/ReplaceCommand.java 2009-05-07 14:14:17 UTC (rev 226)
@@ -32,7 +32,7 @@
* @since 4.0
*/
public class ReplaceCommand extends AbstractDataCommand implements DataWriteCommand {
- public static final byte COMMAND_ID = 122;
+ public static final byte COMMAND_ID = 11;
Object oldValue;
Object newValue;
More information about the infinispan-commits
mailing list