ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vkuliche...@apache.org
Subject [18/20] incubator-ignite git commit: IGNITE-61 - Portable format in direct marshalling
Date Mon, 22 Dec 2014 23:40:12 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5b3f26e/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedLockRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedLockRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedLockRequest.java
index add0721..0a49f10 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedLockRequest.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedLockRequest.java
@@ -498,37 +498,37 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage
                 commState.idx++;
 
             case 9:
-                if (!commState.putGridUuid(null, futId))
+                if (!commState.putGridUuid("futId", futId))
                     return false;
 
                 commState.idx++;
 
             case 10:
-                if (!commState.putByteArray(null, grpLockKeyBytes))
+                if (!commState.putByteArray("grpLockKeyBytes", grpLockKeyBytes))
                     return false;
 
                 commState.idx++;
 
             case 11:
-                if (!commState.putBoolean(null, isInTx))
+                if (!commState.putBoolean("isInTx", isInTx))
                     return false;
 
                 commState.idx++;
 
             case 12:
-                if (!commState.putBoolean(null, isInvalidate))
+                if (!commState.putBoolean("isInvalidate", isInvalidate))
                     return false;
 
                 commState.idx++;
 
             case 13:
-                if (!commState.putBoolean(null, isRead))
+                if (!commState.putBoolean("isRead", isRead))
                     return false;
 
                 commState.idx++;
 
             case 14:
-                if (!commState.putEnum(null, isolation))
+                if (!commState.putEnum("isolation", isolation))
                     return false;
 
                 commState.idx++;
@@ -561,49 +561,49 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage
                 commState.idx++;
 
             case 16:
-                if (!commState.putCacheVersion(null, nearXidVer))
+                if (!commState.putCacheVersion("nearXidVer", nearXidVer))
                     return false;
 
                 commState.idx++;
 
             case 17:
-                if (!commState.putUuid(null, nodeId))
+                if (!commState.putUuid("nodeId", nodeId))
                     return false;
 
                 commState.idx++;
 
             case 18:
-                if (!commState.putBoolean(null, partLock))
+                if (!commState.putBoolean("partLock", partLock))
                     return false;
 
                 commState.idx++;
 
             case 19:
-                if (!commState.putBooleanArray(null, retVals))
+                if (!commState.putBooleanArray("retVals", retVals))
                     return false;
 
                 commState.idx++;
 
             case 20:
-                if (!commState.putLong(null, threadId))
+                if (!commState.putLong("threadId", threadId))
                     return false;
 
                 commState.idx++;
 
             case 21:
-                if (!commState.putLong(null, timeout))
+                if (!commState.putLong("timeout", timeout))
                     return false;
 
                 commState.idx++;
 
             case 22:
-                if (!commState.putInt(null, txSize))
+                if (!commState.putInt("txSize", txSize))
                     return false;
 
                 commState.idx++;
 
             case 23:
-                if (!commState.putByteArray(null, writeEntriesBytes))
+                if (!commState.putByteArray("writeEntriesBytes", writeEntriesBytes))
                     return false;
 
                 commState.idx++;
@@ -652,7 +652,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage
                 commState.idx++;
 
             case 9:
-                IgniteUuid futId0 = commState.getGridUuid(null);
+                IgniteUuid futId0 = commState.getGridUuid("futId");
 
                 if (futId0 == GRID_UUID_NOT_READ)
                     return false;
@@ -662,7 +662,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage
                 commState.idx++;
 
             case 10:
-                byte[] grpLockKeyBytes0 = commState.getByteArray(null);
+                byte[] grpLockKeyBytes0 = commState.getByteArray("grpLockKeyBytes");
 
                 if (grpLockKeyBytes0 == BYTE_ARR_NOT_READ)
                     return false;
@@ -675,7 +675,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage
                 if (buf.remaining() < 1)
                     return false;
 
-                isInTx = commState.getBoolean(null);
+                isInTx = commState.getBoolean("isInTx");
 
                 commState.idx++;
 
@@ -683,7 +683,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage
                 if (buf.remaining() < 1)
                     return false;
 
-                isInvalidate = commState.getBoolean(null);
+                isInvalidate = commState.getBoolean("isInvalidate");
 
                 commState.idx++;
 
@@ -691,7 +691,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage
                 if (buf.remaining() < 1)
                     return false;
 
-                isRead = commState.getBoolean(null);
+                isRead = commState.getBoolean("isRead");
 
                 commState.idx++;
 
@@ -699,7 +699,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage
                 if (buf.remaining() < 1)
                     return false;
 
-                byte isolation0 = commState.getByte(null);
+                byte isolation0 = commState.getByte("isolation");
 
                 isolation = GridCacheTxIsolation.fromOrdinal(isolation0);
 
@@ -735,7 +735,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage
                 commState.idx++;
 
             case 16:
-                GridCacheVersion nearXidVer0 = commState.getCacheVersion(null);
+                GridCacheVersion nearXidVer0 = commState.getCacheVersion("nearXidVer");
 
                 if (nearXidVer0 == CACHE_VER_NOT_READ)
                     return false;
@@ -745,7 +745,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage
                 commState.idx++;
 
             case 17:
-                UUID nodeId0 = commState.getUuid(null);
+                UUID nodeId0 = commState.getUuid("nodeId");
 
                 if (nodeId0 == UUID_NOT_READ)
                     return false;
@@ -758,12 +758,12 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage
                 if (buf.remaining() < 1)
                     return false;
 
-                partLock = commState.getBoolean(null);
+                partLock = commState.getBoolean("partLock");
 
                 commState.idx++;
 
             case 19:
-                boolean[] retVals0 = commState.getBooleanArray(null);
+                boolean[] retVals0 = commState.getBooleanArray("retVals");
 
                 if (retVals0 == BOOLEAN_ARR_NOT_READ)
                     return false;
@@ -776,7 +776,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage
                 if (buf.remaining() < 8)
                     return false;
 
-                threadId = commState.getLong(null);
+                threadId = commState.getLong("threadId");
 
                 commState.idx++;
 
@@ -784,7 +784,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage
                 if (buf.remaining() < 8)
                     return false;
 
-                timeout = commState.getLong(null);
+                timeout = commState.getLong("timeout");
 
                 commState.idx++;
 
@@ -792,12 +792,12 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage
                 if (buf.remaining() < 4)
                     return false;
 
-                txSize = commState.getInt(null);
+                txSize = commState.getInt("txSize");
 
                 commState.idx++;
 
             case 23:
-                byte[] writeEntriesBytes0 = commState.getByteArray(null);
+                byte[] writeEntriesBytes0 = commState.getByteArray("writeEntriesBytes");
 
                 if (writeEntriesBytes0 == BYTE_ARR_NOT_READ)
                     return false;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5b3f26e/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedLockResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedLockResponse.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedLockResponse.java
index cf94059..7facf11 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedLockResponse.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedLockResponse.java
@@ -295,13 +295,13 @@ public class GridDistributedLockResponse<K, V> extends GridDistributedBaseMessag
 
         switch (commState.idx) {
             case 8:
-                if (!commState.putByteArray(null, errBytes))
+                if (!commState.putByteArray("errBytes", errBytes))
                     return false;
 
                 commState.idx++;
 
             case 9:
-                if (!commState.putGridUuid(null, futId))
+                if (!commState.putGridUuid("futId", futId))
                     return false;
 
                 commState.idx++;
@@ -348,7 +348,7 @@ public class GridDistributedLockResponse<K, V> extends GridDistributedBaseMessag
 
         switch (commState.idx) {
             case 8:
-                byte[] errBytes0 = commState.getByteArray(null);
+                byte[] errBytes0 = commState.getByteArray("errBytes");
 
                 if (errBytes0 == BYTE_ARR_NOT_READ)
                     return false;
@@ -358,7 +358,7 @@ public class GridDistributedLockResponse<K, V> extends GridDistributedBaseMessag
                 commState.idx++;
 
             case 9:
-                IgniteUuid futId0 = commState.getGridUuid(null);
+                IgniteUuid futId0 = commState.getGridUuid("futId");
 
                 if (futId0 == GRID_UUID_NOT_READ)
                     return false;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5b3f26e/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxFinishRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxFinishRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxFinishRequest.java
index 8ffbc3d..b41665d 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxFinishRequest.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxFinishRequest.java
@@ -342,6 +342,8 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes
         _clone.commitVer = commitVer;
         _clone.invalidate = invalidate;
         _clone.commit = commit;
+        _clone.syncCommit = syncCommit;
+        _clone.syncRollback = syncRollback;
         _clone.baseVer = baseVer;
         _clone.writeEntries = writeEntries;
         _clone.writeEntriesBytes = writeEntriesBytes;
@@ -369,54 +371,42 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes
 
         switch (commState.idx) {
             case 8:
-                if (!commState.putCacheVersion(null, baseVer))
+                if (!commState.putCacheVersion("baseVer", baseVer))
                     return false;
 
                 commState.idx++;
 
             case 9:
-                if (!commState.putBoolean(null, commit))
+                if (!commState.putBoolean("commit", commit))
                     return false;
 
                 commState.idx++;
 
             case 10:
-                if (!commState.putCacheVersion(null, commitVer))
+                if (!commState.putCacheVersion("commitVer", commitVer))
                     return false;
 
                 commState.idx++;
 
             case 11:
-                if (!commState.putGridUuid(null, futId))
+                if (!commState.putGridUuid("futId", futId))
                     return false;
 
                 commState.idx++;
 
             case 12:
-                if (!commState.putByteArray(null, grpLockKeyBytes))
+                if (!commState.putByteArray("grpLockKeyBytes", grpLockKeyBytes))
                     return false;
 
                 commState.idx++;
 
             case 13:
-                if (!commState.putBoolean(null, invalidate))
+                if (!commState.putBoolean("invalidate", invalidate))
                     return false;
 
                 commState.idx++;
 
             case 14:
-                if (!commState.putBoolean(null, syncCommit))
-                    return false;
-
-                commState.idx++;
-
-            case 15:
-                if (!commState.putBoolean(null, syncRollback))
-                    return false;
-
-                commState.idx++;
-
-            case 16:
                 if (recoveryWritesBytes != null) {
                     if (commState.it == null) {
                         if (!commState.putInt(null, recoveryWritesBytes.size()))
@@ -443,14 +433,26 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes
 
                 commState.idx++;
 
+            case 15:
+                if (!commState.putBoolean("syncCommit", syncCommit))
+                    return false;
+
+                commState.idx++;
+
+            case 16:
+                if (!commState.putBoolean("syncRollback", syncRollback))
+                    return false;
+
+                commState.idx++;
+
             case 17:
-                if (!commState.putLong(null, threadId))
+                if (!commState.putLong("threadId", threadId))
                     return false;
 
                 commState.idx++;
 
             case 18:
-                if (!commState.putInt(null, txSize))
+                if (!commState.putInt("txSize", txSize))
                     return false;
 
                 commState.idx++;
@@ -497,7 +499,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes
 
         switch (commState.idx) {
             case 8:
-                GridCacheVersion baseVer0 = commState.getCacheVersion(null);
+                GridCacheVersion baseVer0 = commState.getCacheVersion("baseVer");
 
                 if (baseVer0 == CACHE_VER_NOT_READ)
                     return false;
@@ -510,12 +512,12 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes
                 if (buf.remaining() < 1)
                     return false;
 
-                commit = commState.getBoolean(null);
+                commit = commState.getBoolean("commit");
 
                 commState.idx++;
 
             case 10:
-                GridCacheVersion commitVer0 = commState.getCacheVersion(null);
+                GridCacheVersion commitVer0 = commState.getCacheVersion("commitVer");
 
                 if (commitVer0 == CACHE_VER_NOT_READ)
                     return false;
@@ -525,7 +527,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes
                 commState.idx++;
 
             case 11:
-                IgniteUuid futId0 = commState.getGridUuid(null);
+                IgniteUuid futId0 = commState.getGridUuid("futId");
 
                 if (futId0 == GRID_UUID_NOT_READ)
                     return false;
@@ -535,7 +537,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes
                 commState.idx++;
 
             case 12:
-                byte[] grpLockKeyBytes0 = commState.getByteArray(null);
+                byte[] grpLockKeyBytes0 = commState.getByteArray("grpLockKeyBytes");
 
                 if (grpLockKeyBytes0 == BYTE_ARR_NOT_READ)
                     return false;
@@ -548,27 +550,11 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes
                 if (buf.remaining() < 1)
                     return false;
 
-                invalidate = commState.getBoolean(null);
+                invalidate = commState.getBoolean("invalidate");
 
                 commState.idx++;
 
             case 14:
-                if (buf.remaining() < 1)
-                    return false;
-
-                syncCommit = commState.getBoolean(null);
-
-                commState.idx++;
-
-            case 15:
-                if (buf.remaining() < 1)
-                    return false;
-
-                syncRollback = commState.getBoolean(null);
-
-                commState.idx++;
-
-            case 16:
                 if (commState.readSize == -1) {
                     if (buf.remaining() < 4)
                         return false;
@@ -597,11 +583,27 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes
 
                 commState.idx++;
 
+            case 15:
+                if (buf.remaining() < 1)
+                    return false;
+
+                syncCommit = commState.getBoolean("syncCommit");
+
+                commState.idx++;
+
+            case 16:
+                if (buf.remaining() < 1)
+                    return false;
+
+                syncRollback = commState.getBoolean("syncRollback");
+
+                commState.idx++;
+
             case 17:
                 if (buf.remaining() < 8)
                     return false;
 
-                threadId = commState.getLong(null);
+                threadId = commState.getLong("threadId");
 
                 commState.idx++;
 
@@ -609,7 +611,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes
                 if (buf.remaining() < 4)
                     return false;
 
-                txSize = commState.getInt(null);
+                txSize = commState.getInt("txSize");
 
                 commState.idx++;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5b3f26e/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxFinishResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxFinishResponse.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxFinishResponse.java
index eb68e05..fd616d0 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxFinishResponse.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxFinishResponse.java
@@ -102,13 +102,13 @@ public class GridDistributedTxFinishResponse<K, V> extends GridCacheMessage<K, V
 
         switch (commState.idx) {
             case 3:
-                if (!commState.putGridUuid(null, futId))
+                if (!commState.putGridUuid("futId", futId))
                     return false;
 
                 commState.idx++;
 
             case 4:
-                if (!commState.putCacheVersion(null, txId))
+                if (!commState.putCacheVersion("txId", txId))
                     return false;
 
                 commState.idx++;
@@ -128,7 +128,7 @@ public class GridDistributedTxFinishResponse<K, V> extends GridCacheMessage<K, V
 
         switch (commState.idx) {
             case 3:
-                IgniteUuid futId0 = commState.getGridUuid(null);
+                IgniteUuid futId0 = commState.getGridUuid("futId");
 
                 if (futId0 == GRID_UUID_NOT_READ)
                     return false;
@@ -138,7 +138,7 @@ public class GridDistributedTxFinishResponse<K, V> extends GridCacheMessage<K, V
                 commState.idx++;
 
             case 4:
-                GridCacheVersion txId0 = commState.getCacheVersion(null);
+                GridCacheVersion txId0 = commState.getCacheVersion("txId");
 
                 if (txId0 == CACHE_VER_NOT_READ)
                     return false;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5b3f26e/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxPrepareRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
index 4aa4963..25db96e 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
@@ -434,43 +434,43 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe
 
         switch (commState.idx) {
             case 8:
-                if (!commState.putCacheVersion(null, commitVer))
+                if (!commState.putCacheVersion("commitVer", commitVer))
                     return false;
 
                 commState.idx++;
 
             case 9:
-                if (!commState.putEnum(null, concurrency))
+                if (!commState.putEnum("concurrency", concurrency))
                     return false;
 
                 commState.idx++;
 
             case 10:
-                if (!commState.putByteArray(null, dhtVersBytes))
+                if (!commState.putByteArray("dhtVersBytes", dhtVersBytes))
                     return false;
 
                 commState.idx++;
 
             case 11:
-                if (!commState.putByteArray(null, grpLockKeyBytes))
+                if (!commState.putByteArray("grpLockKeyBytes", grpLockKeyBytes))
                     return false;
 
                 commState.idx++;
 
             case 12:
-                if (!commState.putBoolean(null, invalidate))
+                if (!commState.putBoolean("invalidate", invalidate))
                     return false;
 
                 commState.idx++;
 
             case 13:
-                if (!commState.putEnum(null, isolation))
+                if (!commState.putEnum("isolation", isolation))
                     return false;
 
                 commState.idx++;
 
             case 14:
-                if (!commState.putBoolean(null, partLock))
+                if (!commState.putBoolean("partLock", partLock))
                     return false;
 
                 commState.idx++;
@@ -503,25 +503,25 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe
                 commState.idx++;
 
             case 16:
-                if (!commState.putLong(null, threadId))
+                if (!commState.putLong("threadId", threadId))
                     return false;
 
                 commState.idx++;
 
             case 17:
-                if (!commState.putLong(null, timeout))
+                if (!commState.putLong("timeout", timeout))
                     return false;
 
                 commState.idx++;
 
             case 18:
-                if (!commState.putByteArray(null, txNodesBytes))
+                if (!commState.putByteArray("txNodesBytes", txNodesBytes))
                     return false;
 
                 commState.idx++;
 
             case 19:
-                if (!commState.putInt(null, txSize))
+                if (!commState.putInt("txSize", txSize))
                     return false;
 
                 commState.idx++;
@@ -568,7 +568,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe
 
         switch (commState.idx) {
             case 8:
-                GridCacheVersion commitVer0 = commState.getCacheVersion(null);
+                GridCacheVersion commitVer0 = commState.getCacheVersion("commitVer");
 
                 if (commitVer0 == CACHE_VER_NOT_READ)
                     return false;
@@ -581,14 +581,14 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe
                 if (buf.remaining() < 1)
                     return false;
 
-                byte concurrency0 = commState.getByte(null);
+                byte concurrency0 = commState.getByte("concurrency");
 
                 concurrency = GridCacheTxConcurrency.fromOrdinal(concurrency0);
 
                 commState.idx++;
 
             case 10:
-                byte[] dhtVersBytes0 = commState.getByteArray(null);
+                byte[] dhtVersBytes0 = commState.getByteArray("dhtVersBytes");
 
                 if (dhtVersBytes0 == BYTE_ARR_NOT_READ)
                     return false;
@@ -598,7 +598,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe
                 commState.idx++;
 
             case 11:
-                byte[] grpLockKeyBytes0 = commState.getByteArray(null);
+                byte[] grpLockKeyBytes0 = commState.getByteArray("grpLockKeyBytes");
 
                 if (grpLockKeyBytes0 == BYTE_ARR_NOT_READ)
                     return false;
@@ -611,7 +611,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe
                 if (buf.remaining() < 1)
                     return false;
 
-                invalidate = commState.getBoolean(null);
+                invalidate = commState.getBoolean("invalidate");
 
                 commState.idx++;
 
@@ -619,7 +619,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe
                 if (buf.remaining() < 1)
                     return false;
 
-                byte isolation0 = commState.getByte(null);
+                byte isolation0 = commState.getByte("isolation");
 
                 isolation = GridCacheTxIsolation.fromOrdinal(isolation0);
 
@@ -629,7 +629,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe
                 if (buf.remaining() < 1)
                     return false;
 
-                partLock = commState.getBoolean(null);
+                partLock = commState.getBoolean("partLock");
 
                 commState.idx++;
 
@@ -666,7 +666,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe
                 if (buf.remaining() < 8)
                     return false;
 
-                threadId = commState.getLong(null);
+                threadId = commState.getLong("threadId");
 
                 commState.idx++;
 
@@ -674,12 +674,12 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe
                 if (buf.remaining() < 8)
                     return false;
 
-                timeout = commState.getLong(null);
+                timeout = commState.getLong("timeout");
 
                 commState.idx++;
 
             case 18:
-                byte[] txNodesBytes0 = commState.getByteArray(null);
+                byte[] txNodesBytes0 = commState.getByteArray("txNodesBytes");
 
                 if (txNodesBytes0 == BYTE_ARR_NOT_READ)
                     return false;
@@ -692,7 +692,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe
                 if (buf.remaining() < 4)
                     return false;
 
-                txSize = commState.getInt(null);
+                txSize = commState.getInt("txSize");
 
                 commState.idx++;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5b3f26e/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxPrepareResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxPrepareResponse.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxPrepareResponse.java
index 2754c9e..64922f7 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxPrepareResponse.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxPrepareResponse.java
@@ -179,13 +179,13 @@ public class GridDistributedTxPrepareResponse<K, V> extends GridDistributedBaseM
 
         switch (commState.idx) {
             case 8:
-                if (!commState.putByteArray(null, candsBytes))
+                if (!commState.putByteArray("candsBytes", candsBytes))
                     return false;
 
                 commState.idx++;
 
             case 9:
-                if (!commState.putByteArray(null, errBytes))
+                if (!commState.putByteArray("errBytes", errBytes))
                     return false;
 
                 commState.idx++;
@@ -205,7 +205,7 @@ public class GridDistributedTxPrepareResponse<K, V> extends GridDistributedBaseM
 
         switch (commState.idx) {
             case 8:
-                byte[] candsBytes0 = commState.getByteArray(null);
+                byte[] candsBytes0 = commState.getByteArray("candsBytes");
 
                 if (candsBytes0 == BYTE_ARR_NOT_READ)
                     return false;
@@ -215,7 +215,7 @@ public class GridDistributedTxPrepareResponse<K, V> extends GridDistributedBaseM
                 commState.idx++;
 
             case 9:
-                byte[] errBytes0 = commState.getByteArray(null);
+                byte[] errBytes0 = commState.getByteArray("errBytes");
 
                 if (errBytes0 == BYTE_ARR_NOT_READ)
                     return false;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5b3f26e/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java
index ef4e7ba..9c6b74b 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java
@@ -93,7 +93,7 @@ public class GridDhtAffinityAssignmentRequest<K, V> extends GridCacheMessage<K,
 
         switch (commState.idx) {
             case 3:
-                if (!commState.putLong(null, topVer))
+                if (!commState.putLong("topVer", topVer))
                     return false;
 
                 commState.idx++;
@@ -115,7 +115,7 @@ public class GridDhtAffinityAssignmentRequest<K, V> extends GridCacheMessage<K,
                 if (buf.remaining() < 8)
                     return false;
 
-                topVer = commState.getLong(null);
+                topVer = commState.getLong("topVer");
 
                 commState.idx++;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5b3f26e/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java
index 2495763..151e833 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java
@@ -134,13 +134,13 @@ public class GridDhtAffinityAssignmentResponse<K, V> extends GridCacheMessage<K,
 
         switch (commState.idx) {
             case 3:
-                if (!commState.putByteArray(null, affAssignmentBytes))
+                if (!commState.putByteArray("affAssignmentBytes", affAssignmentBytes))
                     return false;
 
                 commState.idx++;
 
             case 4:
-                if (!commState.putLong(null, topVer))
+                if (!commState.putLong("topVer", topVer))
                     return false;
 
                 commState.idx++;
@@ -159,7 +159,7 @@ public class GridDhtAffinityAssignmentResponse<K, V> extends GridCacheMessage<K,
 
         switch (commState.idx) {
             case 3:
-                byte[] affAssignmentBytes0 = commState.getByteArray(null);
+                byte[] affAssignmentBytes0 = commState.getByteArray("affAssignmentBytes");
 
                 if (affAssignmentBytes0 == BYTE_ARR_NOT_READ)
                     return false;
@@ -172,7 +172,7 @@ public class GridDhtAffinityAssignmentResponse<K, V> extends GridCacheMessage<K,
                 if (buf.remaining() < 8)
                     return false;
 
-                topVer = commState.getLong(null);
+                topVer = commState.getLong("topVer");
 
                 commState.idx++;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5b3f26e/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLockRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLockRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLockRequest.java
index a78a6e3..685f2b9 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLockRequest.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLockRequest.java
@@ -348,13 +348,13 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> {
 
         switch (commState.idx) {
             case 24:
-                if (!commState.putBitSet(null, invalidateEntries))
+                if (!commState.putBitSet("invalidateEntries", invalidateEntries))
                     return false;
 
                 commState.idx++;
 
             case 25:
-                if (!commState.putGridUuid(null, miniId))
+                if (!commState.putGridUuid("miniId", miniId))
                     return false;
 
                 commState.idx++;
@@ -387,31 +387,31 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> {
                 commState.idx++;
 
             case 27:
-                if (!commState.putByteArray(null, ownedBytes))
+                if (!commState.putByteArray("ownedBytes", ownedBytes))
                     return false;
 
                 commState.idx++;
 
             case 28:
-                if (!commState.putLong(null, topVer))
+                if (!commState.putLong("topVer", topVer))
                     return false;
 
                 commState.idx++;
 
             case 29:
-                if (!commState.putUuid(null, subjId))
+                if (!commState.putUuid("subjId", subjId))
                     return false;
 
                 commState.idx++;
 
             case 30:
-                if (!commState.putInt(null, taskNameHash))
+                if (!commState.putInt("taskNameHash", taskNameHash))
                     return false;
 
                 commState.idx++;
 
             case 31:
-                if (!commState.putBitSet(null, preloadKeys))
+                if (!commState.putBitSet("preloadKeys", preloadKeys))
                     return false;
 
                 commState.idx++;
@@ -431,7 +431,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> {
 
         switch (commState.idx) {
             case 24:
-                BitSet invalidateEntries0 = commState.getBitSet(null);
+                BitSet invalidateEntries0 = commState.getBitSet("invalidateEntries");
 
                 if (invalidateEntries0 == BIT_SET_NOT_READ)
                     return false;
@@ -441,7 +441,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> {
                 commState.idx++;
 
             case 25:
-                IgniteUuid miniId0 = commState.getGridUuid(null);
+                IgniteUuid miniId0 = commState.getGridUuid("miniId");
 
                 if (miniId0 == GRID_UUID_NOT_READ)
                     return false;
@@ -480,7 +480,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> {
                 commState.idx++;
 
             case 27:
-                byte[] ownedBytes0 = commState.getByteArray(null);
+                byte[] ownedBytes0 = commState.getByteArray("ownedBytes");
 
                 if (ownedBytes0 == BYTE_ARR_NOT_READ)
                     return false;
@@ -493,12 +493,12 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> {
                 if (buf.remaining() < 8)
                     return false;
 
-                topVer = commState.getLong(null);
+                topVer = commState.getLong("topVer");
 
                 commState.idx++;
 
             case 29:
-                UUID subjId0 = commState.getUuid(null);
+                UUID subjId0 = commState.getUuid("subjId");
 
                 if (subjId0 == UUID_NOT_READ)
                     return false;
@@ -511,12 +511,12 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> {
                 if (buf.remaining() < 4)
                     return false;
 
-                taskNameHash = commState.getInt(null);
+                taskNameHash = commState.getInt("taskNameHash");
 
                 commState.idx++;
 
             case 31:
-                BitSet preloadKeys0 = commState.getBitSet(null);
+                BitSet preloadKeys0 = commState.getBitSet("preloadKeys");
 
                 if (preloadKeys0 == BIT_SET_NOT_READ)
                     return false;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5b3f26e/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLockResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLockResponse.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLockResponse.java
index 2563a31..6c68bdb 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLockResponse.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLockResponse.java
@@ -257,7 +257,7 @@ public class GridDhtLockResponse<K, V> extends GridDistributedLockResponse<K, V>
                 commState.idx++;
 
             case 12:
-                if (!commState.putGridUuid(null, miniId))
+                if (!commState.putGridUuid("miniId", miniId))
                     return false;
 
                 commState.idx++;
@@ -360,7 +360,7 @@ public class GridDhtLockResponse<K, V> extends GridDistributedLockResponse<K, V>
                 commState.idx++;
 
             case 12:
-                IgniteUuid miniId0 = commState.getGridUuid(null);
+                IgniteUuid miniId0 = commState.getGridUuid("miniId");
 
                 if (miniId0 == GRID_UUID_NOT_READ)
                     return false;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5b3f26e/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
index 105787f..d435b58 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
@@ -323,19 +323,19 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest
 
         switch (commState.idx) {
             case 20:
-                if (!commState.putEnum(null, isolation))
+                if (!commState.putEnum("isolation", isolation))
                     return false;
 
                 commState.idx++;
 
             case 21:
-                if (!commState.putGridUuid(null, miniId))
+                if (!commState.putGridUuid("miniId", miniId))
                     return false;
 
                 commState.idx++;
 
             case 22:
-                if (!commState.putUuid(null, nearNodeId))
+                if (!commState.putUuid("nearNodeId", nearNodeId))
                     return false;
 
                 commState.idx++;
@@ -368,7 +368,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest
                 commState.idx++;
 
             case 24:
-                if (!commState.putBoolean(null, onePhaseCommit))
+                if (!commState.putBoolean("onePhaseCommit", onePhaseCommit))
                     return false;
 
                 commState.idx++;
@@ -401,31 +401,31 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest
                 commState.idx++;
 
             case 26:
-                if (!commState.putBoolean(null, sysInvalidate))
+                if (!commState.putBoolean("sysInvalidate", sysInvalidate))
                     return false;
 
                 commState.idx++;
 
             case 27:
-                if (!commState.putLong(null, topVer))
+                if (!commState.putLong("topVer", topVer))
                     return false;
 
                 commState.idx++;
 
             case 28:
-                if (!commState.putCacheVersion(null, writeVer))
+                if (!commState.putCacheVersion("writeVer", writeVer))
                     return false;
 
                 commState.idx++;
 
             case 29:
-                if (!commState.putUuid(null, subjId))
+                if (!commState.putUuid("subjId", subjId))
                     return false;
 
                 commState.idx++;
 
             case 30:
-                if (!commState.putInt(null, taskNameHash))
+                if (!commState.putInt("taskNameHash", taskNameHash))
                     return false;
 
                 commState.idx++;
@@ -448,14 +448,14 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest
                 if (buf.remaining() < 1)
                     return false;
 
-                byte isolation0 = commState.getByte(null);
+                byte isolation0 = commState.getByte("isolation");
 
                 isolation = GridCacheTxIsolation.fromOrdinal(isolation0);
 
                 commState.idx++;
 
             case 21:
-                IgniteUuid miniId0 = commState.getGridUuid(null);
+                IgniteUuid miniId0 = commState.getGridUuid("miniId");
 
                 if (miniId0 == GRID_UUID_NOT_READ)
                     return false;
@@ -465,7 +465,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest
                 commState.idx++;
 
             case 22:
-                UUID nearNodeId0 = commState.getUuid(null);
+                UUID nearNodeId0 = commState.getUuid("nearNodeId");
 
                 if (nearNodeId0 == UUID_NOT_READ)
                     return false;
@@ -507,7 +507,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest
                 if (buf.remaining() < 1)
                     return false;
 
-                onePhaseCommit = commState.getBoolean(null);
+                onePhaseCommit = commState.getBoolean("onePhaseCommit");
 
                 commState.idx++;
 
@@ -544,7 +544,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest
                 if (buf.remaining() < 1)
                     return false;
 
-                sysInvalidate = commState.getBoolean(null);
+                sysInvalidate = commState.getBoolean("sysInvalidate");
 
                 commState.idx++;
 
@@ -552,12 +552,12 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest
                 if (buf.remaining() < 8)
                     return false;
 
-                topVer = commState.getLong(null);
+                topVer = commState.getLong("topVer");
 
                 commState.idx++;
 
             case 28:
-                GridCacheVersion writeVer0 = commState.getCacheVersion(null);
+                GridCacheVersion writeVer0 = commState.getCacheVersion("writeVer");
 
                 if (writeVer0 == CACHE_VER_NOT_READ)
                     return false;
@@ -567,7 +567,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest
                 commState.idx++;
 
             case 29:
-                UUID subjId0 = commState.getUuid(null);
+                UUID subjId0 = commState.getUuid("subjId");
 
                 if (subjId0 == UUID_NOT_READ)
                     return false;
@@ -580,7 +580,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest
                 if (buf.remaining() < 4)
                     return false;
 
-                taskNameHash = commState.getInt(null);
+                taskNameHash = commState.getInt("taskNameHash");
 
                 commState.idx++;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5b3f26e/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
index b64e780..1215f1e 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
@@ -96,7 +96,7 @@ public class GridDhtTxFinishResponse<K, V> extends GridDistributedTxFinishRespon
 
         switch (commState.idx) {
             case 5:
-                if (!commState.putGridUuid(null, miniId))
+                if (!commState.putGridUuid("miniId", miniId))
                     return false;
 
                 commState.idx++;
@@ -116,7 +116,7 @@ public class GridDhtTxFinishResponse<K, V> extends GridDistributedTxFinishRespon
 
         switch (commState.idx) {
             case 5:
-                IgniteUuid miniId0 = commState.getGridUuid(null);
+                IgniteUuid miniId0 = commState.getGridUuid("miniId");
 
                 if (miniId0 == GRID_UUID_NOT_READ)
                     return false;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5b3f26e/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
index 1455e5d..51be9d5 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
@@ -353,31 +353,31 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque
 
         switch (commState.idx) {
             case 21:
-                if (!commState.putGridUuid(null, futId))
+                if (!commState.putGridUuid("futId", futId))
                     return false;
 
                 commState.idx++;
 
             case 22:
-                if (!commState.putBitSet(null, invalidateNearEntries))
+                if (!commState.putBitSet("invalidateNearEntries", invalidateNearEntries))
                     return false;
 
                 commState.idx++;
 
             case 23:
-                if (!commState.putBoolean(null, last))
+                if (!commState.putBoolean("last", last))
                     return false;
 
                 commState.idx++;
 
             case 24:
-                if (!commState.putGridUuid(null, miniId))
+                if (!commState.putGridUuid("miniId", miniId))
                     return false;
 
                 commState.idx++;
 
             case 25:
-                if (!commState.putUuid(null, nearNodeId))
+                if (!commState.putUuid("nearNodeId", nearNodeId))
                     return false;
 
                 commState.idx++;
@@ -410,37 +410,37 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque
                 commState.idx++;
 
             case 27:
-                if (!commState.putCacheVersion(null, nearXidVer))
+                if (!commState.putCacheVersion("nearXidVer", nearXidVer))
                     return false;
 
                 commState.idx++;
 
             case 28:
-                if (!commState.putByteArray(null, ownedBytes))
+                if (!commState.putByteArray("ownedBytes", ownedBytes))
                     return false;
 
                 commState.idx++;
 
             case 29:
-                if (!commState.putLong(null, topVer))
+                if (!commState.putLong("topVer", topVer))
                     return false;
 
                 commState.idx++;
 
             case 30:
-                if (!commState.putUuid(null, subjId))
+                if (!commState.putUuid("subjId", subjId))
                     return false;
 
                 commState.idx++;
 
             case 31:
-                if (!commState.putInt(null, taskNameHash))
+                if (!commState.putInt("taskNameHash", taskNameHash))
                     return false;
 
                 commState.idx++;
 
             case 32:
-                if (!commState.putBitSet(null, preloadKeys))
+                if (!commState.putBitSet("preloadKeys", preloadKeys))
                     return false;
 
                 commState.idx++;
@@ -460,7 +460,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque
 
         switch (commState.idx) {
             case 21:
-                IgniteUuid futId0 = commState.getGridUuid(null);
+                IgniteUuid futId0 = commState.getGridUuid("futId");
 
                 if (futId0 == GRID_UUID_NOT_READ)
                     return false;
@@ -470,7 +470,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque
                 commState.idx++;
 
             case 22:
-                BitSet invalidateNearEntries0 = commState.getBitSet(null);
+                BitSet invalidateNearEntries0 = commState.getBitSet("invalidateNearEntries");
 
                 if (invalidateNearEntries0 == BIT_SET_NOT_READ)
                     return false;
@@ -483,12 +483,12 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque
                 if (buf.remaining() < 1)
                     return false;
 
-                last = commState.getBoolean(null);
+                last = commState.getBoolean("last");
 
                 commState.idx++;
 
             case 24:
-                IgniteUuid miniId0 = commState.getGridUuid(null);
+                IgniteUuid miniId0 = commState.getGridUuid("miniId");
 
                 if (miniId0 == GRID_UUID_NOT_READ)
                     return false;
@@ -498,7 +498,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque
                 commState.idx++;
 
             case 25:
-                UUID nearNodeId0 = commState.getUuid(null);
+                UUID nearNodeId0 = commState.getUuid("nearNodeId");
 
                 if (nearNodeId0 == UUID_NOT_READ)
                     return false;
@@ -537,7 +537,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque
                 commState.idx++;
 
             case 27:
-                GridCacheVersion nearXidVer0 = commState.getCacheVersion(null);
+                GridCacheVersion nearXidVer0 = commState.getCacheVersion("nearXidVer");
 
                 if (nearXidVer0 == CACHE_VER_NOT_READ)
                     return false;
@@ -547,7 +547,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque
                 commState.idx++;
 
             case 28:
-                byte[] ownedBytes0 = commState.getByteArray(null);
+                byte[] ownedBytes0 = commState.getByteArray("ownedBytes");
 
                 if (ownedBytes0 == BYTE_ARR_NOT_READ)
                     return false;
@@ -560,12 +560,12 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque
                 if (buf.remaining() < 8)
                     return false;
 
-                topVer = commState.getLong(null);
+                topVer = commState.getLong("topVer");
 
                 commState.idx++;
 
             case 30:
-                UUID subjId0 = commState.getUuid(null);
+                UUID subjId0 = commState.getUuid("subjId");
 
                 if (subjId0 == UUID_NOT_READ)
                     return false;
@@ -578,12 +578,12 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque
                 if (buf.remaining() < 4)
                     return false;
 
-                taskNameHash = commState.getInt(null);
+                taskNameHash = commState.getInt("taskNameHash");
 
                 commState.idx++;
 
             case 32:
-                BitSet preloadKeys0 = commState.getBitSet(null);
+                BitSet preloadKeys0 = commState.getBitSet("preloadKeys");
 
                 if (preloadKeys0 == BIT_SET_NOT_READ)
                     return false;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5b3f26e/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
index d541b58..33fe66f 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
@@ -237,7 +237,7 @@ public class GridDhtTxPrepareResponse<K, V> extends GridDistributedTxPrepareResp
 
         switch (commState.idx) {
             case 10:
-                if (!commState.putGridUuid(null, futId))
+                if (!commState.putGridUuid("futId", futId))
                     return false;
 
                 commState.idx++;
@@ -270,7 +270,7 @@ public class GridDhtTxPrepareResponse<K, V> extends GridDistributedTxPrepareResp
                 commState.idx++;
 
             case 12:
-                if (!commState.putGridUuid(null, miniId))
+                if (!commState.putGridUuid("miniId", miniId))
                     return false;
 
                 commState.idx++;
@@ -344,7 +344,7 @@ public class GridDhtTxPrepareResponse<K, V> extends GridDistributedTxPrepareResp
 
         switch (commState.idx) {
             case 10:
-                IgniteUuid futId0 = commState.getGridUuid(null);
+                IgniteUuid futId0 = commState.getGridUuid("futId");
 
                 if (futId0 == GRID_UUID_NOT_READ)
                     return false;
@@ -383,7 +383,7 @@ public class GridDhtTxPrepareResponse<K, V> extends GridDistributedTxPrepareResp
                 commState.idx++;
 
             case 12:
-                IgniteUuid miniId0 = commState.getGridUuid(null);
+                IgniteUuid miniId0 = commState.getGridUuid("miniId");
 
                 if (miniId0 == GRID_UUID_NOT_READ)
                     return false;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5b3f26e/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
index 6e084f3..18ba7c4 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
@@ -652,13 +652,13 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp
 
         switch (commState.idx) {
             case 3:
-                if (!commState.putLongList(null, drExpireTimes))
+                if (!commState.putLongList("drExpireTimes", drExpireTimes))
                     return false;
 
                 commState.idx++;
 
             case 4:
-                if (!commState.putLongList(null, drTtls))
+                if (!commState.putLongList("drTtls", drTtls))
                     return false;
 
                 commState.idx++;
@@ -691,7 +691,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp
                 commState.idx++;
 
             case 6:
-                if (!commState.putCacheVersion(null, futVer))
+                if (!commState.putCacheVersion("futVer", futVer))
                     return false;
 
                 commState.idx++;
@@ -724,25 +724,25 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp
                 commState.idx++;
 
             case 8:
-                if (!commState.putUuid(null, nodeId))
+                if (!commState.putUuid("nodeId", nodeId))
                     return false;
 
                 commState.idx++;
 
             case 9:
-                if (!commState.putEnum(null, syncMode))
+                if (!commState.putEnum("syncMode", syncMode))
                     return false;
 
                 commState.idx++;
 
             case 10:
-                if (!commState.putLong(null, topVer))
+                if (!commState.putLong("topVer", topVer))
                     return false;
 
                 commState.idx++;
 
             case 11:
-                if (!commState.putLong(null, ttl))
+                if (!commState.putLong("ttl", ttl))
                     return false;
 
                 commState.idx++;
@@ -775,7 +775,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp
                 commState.idx++;
 
             case 13:
-                if (!commState.putCacheVersion(null, writeVer))
+                if (!commState.putCacheVersion("writeVer", writeVer))
                     return false;
 
                 commState.idx++;
@@ -835,7 +835,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp
                 commState.idx++;
 
             case 16:
-                if (!commState.putBoolean(null, forceTransformBackups))
+                if (!commState.putBoolean("forceTransformBackups", forceTransformBackups))
                     return false;
 
                 commState.idx++;
@@ -895,13 +895,13 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp
                 commState.idx++;
 
             case 19:
-                if (!commState.putUuid(null, subjId))
+                if (!commState.putUuid("subjId", subjId))
                     return false;
 
                 commState.idx++;
 
             case 20:
-                if (!commState.putInt(null, taskNameHash))
+                if (!commState.putInt("taskNameHash", taskNameHash))
                     return false;
 
                 commState.idx++;
@@ -921,7 +921,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp
 
         switch (commState.idx) {
             case 3:
-                GridLongList drExpireTimes0 = commState.getLongList(null);
+                GridLongList drExpireTimes0 = commState.getLongList("drExpireTimes");
 
                 if (drExpireTimes0 == LONG_LIST_NOT_READ)
                     return false;
@@ -931,7 +931,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp
                 commState.idx++;
 
             case 4:
-                GridLongList drTtls0 = commState.getLongList(null);
+                GridLongList drTtls0 = commState.getLongList("drTtls");
 
                 if (drTtls0 == LONG_LIST_NOT_READ)
                     return false;
@@ -970,7 +970,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp
                 commState.idx++;
 
             case 6:
-                GridCacheVersion futVer0 = commState.getCacheVersion(null);
+                GridCacheVersion futVer0 = commState.getCacheVersion("futVer");
 
                 if (futVer0 == CACHE_VER_NOT_READ)
                     return false;
@@ -1009,7 +1009,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp
                 commState.idx++;
 
             case 8:
-                UUID nodeId0 = commState.getUuid(null);
+                UUID nodeId0 = commState.getUuid("nodeId");
 
                 if (nodeId0 == UUID_NOT_READ)
                     return false;
@@ -1022,7 +1022,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp
                 if (buf.remaining() < 1)
                     return false;
 
-                byte syncMode0 = commState.getByte(null);
+                byte syncMode0 = commState.getByte("syncMode");
 
                 syncMode = GridCacheWriteSynchronizationMode.fromOrdinal(syncMode0);
 
@@ -1032,7 +1032,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp
                 if (buf.remaining() < 8)
                     return false;
 
-                topVer = commState.getLong(null);
+                topVer = commState.getLong("topVer");
 
                 commState.idx++;
 
@@ -1040,7 +1040,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp
                 if (buf.remaining() < 8)
                     return false;
 
-                ttl = commState.getLong(null);
+                ttl = commState.getLong("ttl");
 
                 commState.idx++;
 
@@ -1074,7 +1074,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp
                 commState.idx++;
 
             case 13:
-                GridCacheVersion writeVer0 = commState.getCacheVersion(null);
+                GridCacheVersion writeVer0 = commState.getCacheVersion("writeVer");
 
                 if (writeVer0 == CACHE_VER_NOT_READ)
                     return false;
@@ -1145,7 +1145,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp
                 if (buf.remaining() < 1)
                     return false;
 
-                forceTransformBackups = commState.getBoolean(null);
+                forceTransformBackups = commState.getBoolean("forceTransformBackups");
 
                 commState.idx++;
 
@@ -1208,7 +1208,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp
                 commState.idx++;
 
             case 19:
-                UUID subjId0 = commState.getUuid(null);
+                UUID subjId0 = commState.getUuid("subjId");
 
                 if (subjId0 == UUID_NOT_READ)
                     return false;
@@ -1221,7 +1221,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp
                 if (buf.remaining() < 4)
                     return false;
 
-                taskNameHash = commState.getInt(null);
+                taskNameHash = commState.getInt("taskNameHash");
 
                 commState.idx++;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5b3f26e/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
index 5d3ba59..bc54e2f 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
@@ -211,19 +211,19 @@ public class GridDhtAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> im
 
         switch (commState.idx) {
             case 3:
-                if (!commState.putByteArray(null, errBytes))
+                if (!commState.putByteArray("errBytes", errBytes))
                     return false;
 
                 commState.idx++;
 
             case 4:
-                if (!commState.putByteArray(null, failedKeysBytes))
+                if (!commState.putByteArray("failedKeysBytes", failedKeysBytes))
                     return false;
 
                 commState.idx++;
 
             case 5:
-                if (!commState.putCacheVersion(null, futVer))
+                if (!commState.putCacheVersion("futVer", futVer))
                     return false;
 
                 commState.idx++;
@@ -270,7 +270,7 @@ public class GridDhtAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> im
 
         switch (commState.idx) {
             case 3:
-                byte[] errBytes0 = commState.getByteArray(null);
+                byte[] errBytes0 = commState.getByteArray("errBytes");
 
                 if (errBytes0 == BYTE_ARR_NOT_READ)
                     return false;
@@ -280,7 +280,7 @@ public class GridDhtAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> im
                 commState.idx++;
 
             case 4:
-                byte[] failedKeysBytes0 = commState.getByteArray(null);
+                byte[] failedKeysBytes0 = commState.getByteArray("failedKeysBytes");
 
                 if (failedKeysBytes0 == BYTE_ARR_NOT_READ)
                     return false;
@@ -290,7 +290,7 @@ public class GridDhtAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> im
                 commState.idx++;
 
             case 5:
-                GridCacheVersion futVer0 = commState.getCacheVersion(null);
+                GridCacheVersion futVer0 = commState.getCacheVersion("futVer");
 
                 if (futVer0 == CACHE_VER_NOT_READ)
                     return false;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5b3f26e/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java
index 446a521..353446a 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java
@@ -553,13 +553,13 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im
 
         switch (commState.idx) {
             case 3:
-                if (!commState.putLongList(null, drExpireTimes))
+                if (!commState.putLongList("drExpireTimes", drExpireTimes))
                     return false;
 
                 commState.idx++;
 
             case 4:
-                if (!commState.putLongList(null, drTtls))
+                if (!commState.putLongList("drTtls", drTtls))
                     return false;
 
                 commState.idx++;
@@ -592,7 +592,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im
                 commState.idx++;
 
             case 6:
-                if (!commState.putBoolean(null, fastMap))
+                if (!commState.putBoolean("fastMap", fastMap))
                     return false;
 
                 commState.idx++;
@@ -625,13 +625,13 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im
                 commState.idx++;
 
             case 8:
-                if (!commState.putCacheVersion(null, futVer))
+                if (!commState.putCacheVersion("futVer", futVer))
                     return false;
 
                 commState.idx++;
 
             case 9:
-                if (!commState.putBoolean(null, hasPrimary))
+                if (!commState.putBoolean("hasPrimary", hasPrimary))
                     return false;
 
                 commState.idx++;
@@ -664,37 +664,37 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im
                 commState.idx++;
 
             case 11:
-                if (!commState.putEnum(null, op))
+                if (!commState.putEnum("op", op))
                     return false;
 
                 commState.idx++;
 
             case 12:
-                if (!commState.putBoolean(null, retval))
+                if (!commState.putBoolean("retval", retval))
                     return false;
 
                 commState.idx++;
 
             case 13:
-                if (!commState.putEnum(null, syncMode))
+                if (!commState.putEnum("syncMode", syncMode))
                     return false;
 
                 commState.idx++;
 
             case 14:
-                if (!commState.putLong(null, topVer))
+                if (!commState.putLong("topVer", topVer))
                     return false;
 
                 commState.idx++;
 
             case 15:
-                if (!commState.putLong(null, ttl))
+                if (!commState.putLong("ttl", ttl))
                     return false;
 
                 commState.idx++;
 
             case 16:
-                if (!commState.putCacheVersion(null, updateVer))
+                if (!commState.putCacheVersion("updateVer", updateVer))
                     return false;
 
                 commState.idx++;
@@ -727,19 +727,19 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im
                 commState.idx++;
 
             case 18:
-                if (!commState.putBoolean(null, forceTransformBackups))
+                if (!commState.putBoolean("forceTransformBackups", forceTransformBackups))
                     return false;
 
                 commState.idx++;
 
             case 19:
-                if (!commState.putUuid(null, subjId))
+                if (!commState.putUuid("subjId", subjId))
                     return false;
 
                 commState.idx++;
 
             case 20:
-                if (!commState.putInt(null, taskNameHash))
+                if (!commState.putInt("taskNameHash", taskNameHash))
                     return false;
 
                 commState.idx++;
@@ -759,7 +759,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im
 
         switch (commState.idx) {
             case 3:
-                GridLongList drExpireTimes0 = commState.getLongList(null);
+                GridLongList drExpireTimes0 = commState.getLongList("drExpireTimes");
 
                 if (drExpireTimes0 == LONG_LIST_NOT_READ)
                     return false;
@@ -769,7 +769,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im
                 commState.idx++;
 
             case 4:
-                GridLongList drTtls0 = commState.getLongList(null);
+                GridLongList drTtls0 = commState.getLongList("drTtls");
 
                 if (drTtls0 == LONG_LIST_NOT_READ)
                     return false;
@@ -811,7 +811,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im
                 if (buf.remaining() < 1)
                     return false;
 
-                fastMap = commState.getBoolean(null);
+                fastMap = commState.getBoolean("fastMap");
 
                 commState.idx++;
 
@@ -845,7 +845,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im
                 commState.idx++;
 
             case 8:
-                GridCacheVersion futVer0 = commState.getCacheVersion(null);
+                GridCacheVersion futVer0 = commState.getCacheVersion("futVer");
 
                 if (futVer0 == CACHE_VER_NOT_READ)
                     return false;
@@ -858,7 +858,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im
                 if (buf.remaining() < 1)
                     return false;
 
-                hasPrimary = commState.getBoolean(null);
+                hasPrimary = commState.getBoolean("hasPrimary");
 
                 commState.idx++;
 
@@ -895,7 +895,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im
                 if (buf.remaining() < 1)
                     return false;
 
-                byte op0 = commState.getByte(null);
+                byte op0 = commState.getByte("op");
 
                 op = GridCacheOperation.fromOrdinal(op0);
 
@@ -905,7 +905,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im
                 if (buf.remaining() < 1)
                     return false;
 
-                retval = commState.getBoolean(null);
+                retval = commState.getBoolean("retval");
 
                 commState.idx++;
 
@@ -913,7 +913,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im
                 if (buf.remaining() < 1)
                     return false;
 
-                byte syncMode0 = commState.getByte(null);
+                byte syncMode0 = commState.getByte("syncMode");
 
                 syncMode = GridCacheWriteSynchronizationMode.fromOrdinal(syncMode0);
 
@@ -923,7 +923,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im
                 if (buf.remaining() < 8)
                     return false;
 
-                topVer = commState.getLong(null);
+                topVer = commState.getLong("topVer");
 
                 commState.idx++;
 
@@ -931,12 +931,12 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im
                 if (buf.remaining() < 8)
                     return false;
 
-                ttl = commState.getLong(null);
+                ttl = commState.getLong("ttl");
 
                 commState.idx++;
 
             case 16:
-                GridCacheVersion updateVer0 = commState.getCacheVersion(null);
+                GridCacheVersion updateVer0 = commState.getCacheVersion("updateVer");
 
                 if (updateVer0 == CACHE_VER_NOT_READ)
                     return false;
@@ -978,12 +978,12 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im
                 if (buf.remaining() < 1)
                     return false;
 
-                forceTransformBackups = commState.getBoolean(null);
+                forceTransformBackups = commState.getBoolean("forceTransformBackups");
 
                 commState.idx++;
 
             case 19:
-                UUID subjId0 = commState.getUuid(null);
+                UUID subjId0 = commState.getUuid("subjId");
 
                 if (subjId0 == UUID_NOT_READ)
                     return false;
@@ -996,7 +996,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im
                 if (buf.remaining() < 4)
                     return false;
 
-                taskNameHash = commState.getInt(null);
+                taskNameHash = commState.getInt("taskNameHash");
 
                 commState.idx++;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5b3f26e/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java
index ba683c3..363ac8b 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java
@@ -404,31 +404,31 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i
 
         switch (commState.idx) {
             case 3:
-                if (!commState.putByteArray(null, errBytes))
+                if (!commState.putByteArray("errBytes", errBytes))
                     return false;
 
                 commState.idx++;
 
             case 4:
-                if (!commState.putByteArray(null, failedKeysBytes))
+                if (!commState.putByteArray("failedKeysBytes", failedKeysBytes))
                     return false;
 
                 commState.idx++;
 
             case 5:
-                if (!commState.putCacheVersion(null, futVer))
+                if (!commState.putCacheVersion("futVer", futVer))
                     return false;
 
                 commState.idx++;
 
             case 6:
-                if (!commState.putByteArray(null, remapKeysBytes))
+                if (!commState.putByteArray("remapKeysBytes", remapKeysBytes))
                     return false;
 
                 commState.idx++;
 
             case 7:
-                if (!commState.putByteArray(null, retValBytes))
+                if (!commState.putByteArray("retValBytes", retValBytes))
                     return false;
 
                 commState.idx++;
@@ -461,7 +461,7 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i
                 commState.idx++;
 
             case 9:
-                if (!commState.putLong(null, nearTtl))
+                if (!commState.putLong("nearTtl", nearTtl))
                     return false;
 
                 commState.idx++;
@@ -521,7 +521,7 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i
                 commState.idx++;
 
             case 12:
-                if (!commState.putCacheVersion(null, nearVer))
+                if (!commState.putCacheVersion("nearVer", nearVer))
                     return false;
 
                 commState.idx++;
@@ -541,7 +541,7 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i
 
         switch (commState.idx) {
             case 3:
-                byte[] errBytes0 = commState.getByteArray(null);
+                byte[] errBytes0 = commState.getByteArray("errBytes");
 
                 if (errBytes0 == BYTE_ARR_NOT_READ)
                     return false;
@@ -551,7 +551,7 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i
                 commState.idx++;
 
             case 4:
-                byte[] failedKeysBytes0 = commState.getByteArray(null);
+                byte[] failedKeysBytes0 = commState.getByteArray("failedKeysBytes");
 
                 if (failedKeysBytes0 == BYTE_ARR_NOT_READ)
                     return false;
@@ -561,7 +561,7 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i
                 commState.idx++;
 
             case 5:
-                GridCacheVersion futVer0 = commState.getCacheVersion(null);
+                GridCacheVersion futVer0 = commState.getCacheVersion("futVer");
 
                 if (futVer0 == CACHE_VER_NOT_READ)
                     return false;
@@ -571,7 +571,7 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i
                 commState.idx++;
 
             case 6:
-                byte[] remapKeysBytes0 = commState.getByteArray(null);
+                byte[] remapKeysBytes0 = commState.getByteArray("remapKeysBytes");
 
                 if (remapKeysBytes0 == BYTE_ARR_NOT_READ)
                     return false;
@@ -581,7 +581,7 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i
                 commState.idx++;
 
             case 7:
-                byte[] retValBytes0 = commState.getByteArray(null);
+                byte[] retValBytes0 = commState.getByteArray("retValBytes");
 
                 if (retValBytes0 == BYTE_ARR_NOT_READ)
                     return false;
@@ -623,7 +623,7 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i
                 if (buf.remaining() < 8)
                     return false;
 
-                nearTtl = commState.getLong(null);
+                nearTtl = commState.getLong("nearTtl");
 
                 commState.idx++;
 
@@ -686,7 +686,7 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i
                 commState.idx++;
 
             case 12:
-                GridCacheVersion nearVer0 = commState.getCacheVersion(null);
+                GridCacheVersion nearVer0 = commState.getCacheVersion("nearVer");
 
                 if (nearVer0 == CACHE_VER_NOT_READ)
                     return false;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5b3f26e/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java
index 30c18cc..60f9144 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java
@@ -193,7 +193,7 @@ public class GridDhtForceKeysRequest<K, V> extends GridCacheMessage<K, V> implem
 
         switch (commState.idx) {
             case 3:
-                if (!commState.putGridUuid(null, futId))
+                if (!commState.putGridUuid("futId", futId))
                     return false;
 
                 commState.idx++;
@@ -226,13 +226,13 @@ public class GridDhtForceKeysRequest<K, V> extends GridCacheMessage<K, V> implem
                 commState.idx++;
 
             case 5:
-                if (!commState.putGridUuid(null, miniId))
+                if (!commState.putGridUuid("miniId", miniId))
                     return false;
 
                 commState.idx++;
 
             case 6:
-                if (!commState.putLong(null, topVer))
+                if (!commState.putLong("topVer", topVer))
                     return false;
 
                 commState.idx++;
@@ -252,7 +252,7 @@ public class GridDhtForceKeysRequest<K, V> extends GridCacheMessage<K, V> implem
 
         switch (commState.idx) {
             case 3:
-                IgniteUuid futId0 = commState.getGridUuid(null);
+                IgniteUuid futId0 = commState.getGridUuid("futId");
 
                 if (futId0 == GRID_UUID_NOT_READ)
                     return false;
@@ -291,7 +291,7 @@ public class GridDhtForceKeysRequest<K, V> extends GridCacheMessage<K, V> implem
                 commState.idx++;
 
             case 5:
-                IgniteUuid miniId0 = commState.getGridUuid(null);
+                IgniteUuid miniId0 = commState.getGridUuid("miniId");
 
                 if (miniId0 == GRID_UUID_NOT_READ)
                     return false;
@@ -304,7 +304,7 @@ public class GridDhtForceKeysRequest<K, V> extends GridCacheMessage<K, V> implem
                 if (buf.remaining() < 8)
                     return false;
 
-                topVer = commState.getLong(null);
+                topVer = commState.getLong("topVer");
 
                 commState.idx++;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5b3f26e/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java
index e333a95..bd56937 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java
@@ -197,19 +197,19 @@ public class GridDhtForceKeysResponse<K, V> extends GridCacheMessage<K, V> imple
 
         switch (commState.idx) {
             case 3:
-                if (!commState.putGridUuid(null, futId))
+                if (!commState.putGridUuid("futId", futId))
                     return false;
 
                 commState.idx++;
 
             case 4:
-                if (!commState.putByteArray(null, infosBytes))
+                if (!commState.putByteArray("infosBytes", infosBytes))
                     return false;
 
                 commState.idx++;
 
             case 5:
-                if (!commState.putGridUuid(null, miniId))
+                if (!commState.putGridUuid("miniId", miniId))
                     return false;
 
                 commState.idx++;
@@ -256,7 +256,7 @@ public class GridDhtForceKeysResponse<K, V> extends GridCacheMessage<K, V> imple
 
         switch (commState.idx) {
             case 3:
-                IgniteUuid futId0 = commState.getGridUuid(null);
+                IgniteUuid futId0 = commState.getGridUuid("futId");
 
                 if (futId0 == GRID_UUID_NOT_READ)
                     return false;
@@ -266,7 +266,7 @@ public class GridDhtForceKeysResponse<K, V> extends GridCacheMessage<K, V> imple
                 commState.idx++;
 
             case 4:
-                byte[] infosBytes0 = commState.getByteArray(null);
+                byte[] infosBytes0 = commState.getByteArray("infosBytes");
 
                 if (infosBytes0 == BYTE_ARR_NOT_READ)
                     return false;
@@ -276,7 +276,7 @@ public class GridDhtForceKeysResponse<K, V> extends GridCacheMessage<K, V> imple
                 commState.idx++;
 
             case 5:
-                IgniteUuid miniId0 = commState.getGridUuid(null);
+                IgniteUuid miniId0 = commState.getGridUuid("miniId");
 
                 if (miniId0 == GRID_UUID_NOT_READ)
                     return false;


Mime
View raw message