ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vkuliche...@apache.org
Subject [17/20] incubator-ignite git commit: IGNITE-61 - Portable format in direct marshalling
Date Mon, 22 Dec 2014 23:40:11 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/dht/preloader/GridDhtPartitionDemandMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java
index f77adc5..bb036cd 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java
@@ -250,31 +250,31 @@ public class GridDhtPartitionDemandMessage<K, V> extends GridCacheMessage<K, V>
                 commState.idx++;
 
             case 4:
-                if (!commState.putLong(null, timeout))
+                if (!commState.putLong("timeout", timeout))
                     return false;
 
                 commState.idx++;
 
             case 5:
-                if (!commState.putLong(null, topVer))
+                if (!commState.putLong("topVer", topVer))
                     return false;
 
                 commState.idx++;
 
             case 6:
-                if (!commState.putByteArray(null, topicBytes))
+                if (!commState.putByteArray("topicBytes", topicBytes))
                     return false;
 
                 commState.idx++;
 
             case 7:
-                if (!commState.putLong(null, updateSeq))
+                if (!commState.putLong("updateSeq", updateSeq))
                     return false;
 
                 commState.idx++;
 
             case 8:
-                if (!commState.putInt(null, workerId))
+                if (!commState.putInt("workerId", workerId))
                     return false;
 
                 commState.idx++;
@@ -326,7 +326,7 @@ public class GridDhtPartitionDemandMessage<K, V> extends GridCacheMessage<K, V>
                 if (buf.remaining() < 8)
                     return false;
 
-                timeout = commState.getLong(null);
+                timeout = commState.getLong("timeout");
 
                 commState.idx++;
 
@@ -334,12 +334,12 @@ public class GridDhtPartitionDemandMessage<K, V> extends GridCacheMessage<K, V>
                 if (buf.remaining() < 8)
                     return false;
 
-                topVer = commState.getLong(null);
+                topVer = commState.getLong("topVer");
 
                 commState.idx++;
 
             case 6:
-                byte[] topicBytes0 = commState.getByteArray(null);
+                byte[] topicBytes0 = commState.getByteArray("topicBytes");
 
                 if (topicBytes0 == BYTE_ARR_NOT_READ)
                     return false;
@@ -352,7 +352,7 @@ public class GridDhtPartitionDemandMessage<K, V> extends GridCacheMessage<K, V>
                 if (buf.remaining() < 8)
                     return false;
 
-                updateSeq = commState.getLong(null);
+                updateSeq = commState.getLong("updateSeq");
 
                 commState.idx++;
 
@@ -360,7 +360,7 @@ public class GridDhtPartitionDemandMessage<K, V> extends GridCacheMessage<K, V>
                 if (buf.remaining() < 4)
                     return false;
 
-                workerId = commState.getInt(null);
+                workerId = commState.getInt("workerId");
 
                 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/GridDhtPartitionSupplyMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java
index bf3b606..4736f5c 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java
@@ -308,13 +308,13 @@ public class GridDhtPartitionSupplyMessage<K, V> extends GridCacheMessage<K, V>
 
         switch (commState.idx) {
             case 3:
-                if (!commState.putBoolean(null, ack))
+                if (!commState.putBoolean("ack", ack))
                     return false;
 
                 commState.idx++;
 
             case 4:
-                if (!commState.putByteArray(null, infoBytes))
+                if (!commState.putByteArray("infoBytes", infoBytes))
                     return false;
 
                 commState.idx++;
@@ -374,13 +374,13 @@ public class GridDhtPartitionSupplyMessage<K, V> extends GridCacheMessage<K, V>
                 commState.idx++;
 
             case 7:
-                if (!commState.putLong(null, updateSeq))
+                if (!commState.putLong("updateSeq", updateSeq))
                     return false;
 
                 commState.idx++;
 
             case 8:
-                if (!commState.putInt(null, workerId))
+                if (!commState.putInt("workerId", workerId))
                     return false;
 
                 commState.idx++;
@@ -403,12 +403,12 @@ public class GridDhtPartitionSupplyMessage<K, V> extends GridCacheMessage<K, V>
                 if (buf.remaining() < 1)
                     return false;
 
-                ack = commState.getBoolean(null);
+                ack = commState.getBoolean("ack");
 
                 commState.idx++;
 
             case 4:
-                byte[] infoBytes0 = commState.getByteArray(null);
+                byte[] infoBytes0 = commState.getByteArray("infoBytes");
 
                 if (infoBytes0 == BYTE_ARR_NOT_READ)
                     return false;
@@ -479,7 +479,7 @@ public class GridDhtPartitionSupplyMessage<K, V> extends GridCacheMessage<K, V>
                 if (buf.remaining() < 8)
                     return false;
 
-                updateSeq = commState.getLong(null);
+                updateSeq = commState.getLong("updateSeq");
 
                 commState.idx++;
 
@@ -487,7 +487,7 @@ public class GridDhtPartitionSupplyMessage<K, V> extends GridCacheMessage<K, V>
                 if (buf.remaining() < 4)
                     return false;
 
-                workerId = commState.getInt(null);
+                workerId = commState.getInt("workerId");
 
                 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/GridDhtPartitionsAbstractMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java
index e275f17..6b975e7 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java
@@ -92,13 +92,13 @@ abstract class GridDhtPartitionsAbstractMessage<K, V> extends GridCacheMessage<K
 
         switch (commState.idx) {
             case 3:
-                if (!commState.putDhtPartitionExchangeId(null, exchId))
+                if (!commState.putDhtPartitionExchangeId("exchId", exchId))
                     return false;
 
                 commState.idx++;
 
             case 4:
-                if (!commState.putCacheVersion(null, lastVer))
+                if (!commState.putCacheVersion("lastVer", lastVer))
                     return false;
 
                 commState.idx++;
@@ -118,7 +118,7 @@ abstract class GridDhtPartitionsAbstractMessage<K, V> extends GridCacheMessage<K
 
         switch (commState.idx) {
             case 3:
-                GridDhtPartitionExchangeId exchId0 = commState.getDhtPartitionExchangeId(null);
+                GridDhtPartitionExchangeId exchId0 = commState.getDhtPartitionExchangeId("exchId");
 
                 if (exchId0 == DHT_PART_EXCHANGE_ID_NOT_READ)
                     return false;
@@ -128,7 +128,7 @@ abstract class GridDhtPartitionsAbstractMessage<K, V> extends GridCacheMessage<K
                 commState.idx++;
 
             case 4:
-                GridCacheVersion lastVer0 = commState.getCacheVersion(null);
+                GridCacheVersion lastVer0 = commState.getCacheVersion("lastVer");
 
                 if (lastVer0 == 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/GridDhtPartitionsFullMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java
index d4d4570..7ce0084 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java
@@ -173,19 +173,19 @@ public class GridDhtPartitionsFullMessage<K, V> extends GridDhtPartitionsAbstrac
 
         switch (commState.idx) {
             case 5:
-                if (!commState.putByteArray(null, affAssignmentBytes))
+                if (!commState.putByteArray("affAssignmentBytes", affAssignmentBytes))
                     return false;
 
                 commState.idx++;
 
             case 6:
-                if (!commState.putByteArray(null, partsBytes))
+                if (!commState.putByteArray("partsBytes", partsBytes))
                     return false;
 
                 commState.idx++;
 
             case 7:
-                if (!commState.putLong(null, topVer))
+                if (!commState.putLong("topVer", topVer))
                     return false;
 
                 commState.idx++;
@@ -205,7 +205,7 @@ public class GridDhtPartitionsFullMessage<K, V> extends GridDhtPartitionsAbstrac
 
         switch (commState.idx) {
             case 5:
-                byte[] affAssignmentBytes0 = commState.getByteArray(null);
+                byte[] affAssignmentBytes0 = commState.getByteArray("affAssignmentBytes");
 
                 if (affAssignmentBytes0 == BYTE_ARR_NOT_READ)
                     return false;
@@ -215,7 +215,7 @@ public class GridDhtPartitionsFullMessage<K, V> extends GridDhtPartitionsAbstrac
                 commState.idx++;
 
             case 6:
-                byte[] partsBytes0 = commState.getByteArray(null);
+                byte[] partsBytes0 = commState.getByteArray("partsBytes");
 
                 if (partsBytes0 == BYTE_ARR_NOT_READ)
                     return false;
@@ -228,7 +228,7 @@ public class GridDhtPartitionsFullMessage<K, V> extends GridDhtPartitionsAbstrac
                 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/GridDhtPartitionsSingleMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java
index 0671800..a2cee94 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java
@@ -122,7 +122,7 @@ public class GridDhtPartitionsSingleMessage<K, V> extends GridDhtPartitionsAbstr
 
         switch (commState.idx) {
             case 5:
-                if (!commState.putByteArray(null, partsBytes))
+                if (!commState.putByteArray("partsBytes", partsBytes))
                     return false;
 
                 commState.idx++;
@@ -142,7 +142,7 @@ public class GridDhtPartitionsSingleMessage<K, V> extends GridDhtPartitionsAbstr
 
         switch (commState.idx) {
             case 5:
-                byte[] partsBytes0 = commState.getByteArray(null);
+                byte[] partsBytes0 = commState.getByteArray("partsBytes");
 
                 if (partsBytes0 == 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/near/GridNearGetRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetRequest.java
index 61815b0..133569a 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetRequest.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetRequest.java
@@ -285,7 +285,7 @@ public class GridNearGetRequest<K, V> extends GridCacheMessage<K, V> implements
                 commState.idx++;
 
             case 4:
-                if (!commState.putGridUuid(null, futId))
+                if (!commState.putGridUuid("futId", futId))
                     return false;
 
                 commState.idx++;
@@ -329,37 +329,37 @@ public class GridNearGetRequest<K, V> extends GridCacheMessage<K, V> implements
                 commState.idx++;
 
             case 6:
-                if (!commState.putGridUuid(null, miniId))
+                if (!commState.putGridUuid("miniId", miniId))
                     return false;
 
                 commState.idx++;
 
             case 7:
-                if (!commState.putBoolean(null, reload))
+                if (!commState.putBoolean("reload", reload))
                     return false;
 
                 commState.idx++;
 
             case 8:
-                if (!commState.putLong(null, topVer))
+                if (!commState.putLong("topVer", topVer))
                     return false;
 
                 commState.idx++;
 
             case 9:
-                if (!commState.putCacheVersion(null, ver))
+                if (!commState.putCacheVersion("ver", ver))
                     return false;
 
                 commState.idx++;
 
             case 10:
-                if (!commState.putUuid(null, subjId))
+                if (!commState.putUuid("subjId", subjId))
                     return false;
 
                 commState.idx++;
 
             case 11:
-                if (!commState.putInt(null, taskNameHash))
+                if (!commState.putInt("taskNameHash", taskNameHash))
                     return false;
 
                 commState.idx++;
@@ -408,7 +408,7 @@ public class GridNearGetRequest<K, V> extends GridCacheMessage<K, V> implements
                 commState.idx++;
 
             case 4:
-                IgniteUuid futId0 = commState.getGridUuid(null);
+                IgniteUuid futId0 = commState.getGridUuid("futId");
 
                 if (futId0 == GRID_UUID_NOT_READ)
                     return false;
@@ -460,7 +460,7 @@ public class GridNearGetRequest<K, V> extends GridCacheMessage<K, V> implements
                 commState.idx++;
 
             case 6:
-                IgniteUuid miniId0 = commState.getGridUuid(null);
+                IgniteUuid miniId0 = commState.getGridUuid("miniId");
 
                 if (miniId0 == GRID_UUID_NOT_READ)
                     return false;
@@ -473,7 +473,7 @@ public class GridNearGetRequest<K, V> extends GridCacheMessage<K, V> implements
                 if (buf.remaining() < 1)
                     return false;
 
-                reload = commState.getBoolean(null);
+                reload = commState.getBoolean("reload");
 
                 commState.idx++;
 
@@ -481,12 +481,12 @@ public class GridNearGetRequest<K, V> extends GridCacheMessage<K, V> implements
                 if (buf.remaining() < 8)
                     return false;
 
-                topVer = commState.getLong(null);
+                topVer = commState.getLong("topVer");
 
                 commState.idx++;
 
             case 9:
-                GridCacheVersion ver0 = commState.getCacheVersion(null);
+                GridCacheVersion ver0 = commState.getCacheVersion("ver");
 
                 if (ver0 == CACHE_VER_NOT_READ)
                     return false;
@@ -496,7 +496,7 @@ public class GridNearGetRequest<K, V> extends GridCacheMessage<K, V> implements
                 commState.idx++;
 
             case 10:
-                UUID subjId0 = commState.getUuid(null);
+                UUID subjId0 = commState.getUuid("subjId");
 
                 if (subjId0 == UUID_NOT_READ)
                     return false;
@@ -509,7 +509,7 @@ public class GridNearGetRequest<K, V> extends GridCacheMessage<K, V> implements
                 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/near/GridNearGetResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetResponse.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetResponse.java
index 1eba548..c652c52 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetResponse.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetResponse.java
@@ -234,19 +234,19 @@ public class GridNearGetResponse<K, V> extends GridCacheMessage<K, V> implements
 
         switch (commState.idx) {
             case 3:
-                if (!commState.putByteArray(null, entriesBytes))
+                if (!commState.putByteArray("entriesBytes", entriesBytes))
                     return false;
 
                 commState.idx++;
 
             case 4:
-                if (!commState.putByteArray(null, errBytes))
+                if (!commState.putByteArray("errBytes", errBytes))
                     return false;
 
                 commState.idx++;
 
             case 5:
-                if (!commState.putGridUuid(null, futId))
+                if (!commState.putGridUuid("futId", futId))
                     return false;
 
                 commState.idx++;
@@ -279,19 +279,19 @@ public class GridNearGetResponse<K, V> extends GridCacheMessage<K, V> implements
                 commState.idx++;
 
             case 7:
-                if (!commState.putGridUuid(null, miniId))
+                if (!commState.putGridUuid("miniId", miniId))
                     return false;
 
                 commState.idx++;
 
             case 8:
-                if (!commState.putLong(null, topVer))
+                if (!commState.putLong("topVer", topVer))
                     return false;
 
                 commState.idx++;
 
             case 9:
-                if (!commState.putCacheVersion(null, ver))
+                if (!commState.putCacheVersion("ver", ver))
                     return false;
 
                 commState.idx++;
@@ -311,7 +311,7 @@ public class GridNearGetResponse<K, V> extends GridCacheMessage<K, V> implements
 
         switch (commState.idx) {
             case 3:
-                byte[] entriesBytes0 = commState.getByteArray(null);
+                byte[] entriesBytes0 = commState.getByteArray("entriesBytes");
 
                 if (entriesBytes0 == BYTE_ARR_NOT_READ)
                     return false;
@@ -321,7 +321,7 @@ public class GridNearGetResponse<K, V> extends GridCacheMessage<K, V> implements
                 commState.idx++;
 
             case 4:
-                byte[] errBytes0 = commState.getByteArray(null);
+                byte[] errBytes0 = commState.getByteArray("errBytes");
 
                 if (errBytes0 == BYTE_ARR_NOT_READ)
                     return false;
@@ -331,7 +331,7 @@ public class GridNearGetResponse<K, V> extends GridCacheMessage<K, V> implements
                 commState.idx++;
 
             case 5:
-                IgniteUuid futId0 = commState.getGridUuid(null);
+                IgniteUuid futId0 = commState.getGridUuid("futId");
 
                 if (futId0 == GRID_UUID_NOT_READ)
                     return false;
@@ -370,7 +370,7 @@ public class GridNearGetResponse<K, V> extends GridCacheMessage<K, V> implements
                 commState.idx++;
 
             case 7:
-                IgniteUuid miniId0 = commState.getGridUuid(null);
+                IgniteUuid miniId0 = commState.getGridUuid("miniId");
 
                 if (miniId0 == GRID_UUID_NOT_READ)
                     return false;
@@ -383,12 +383,12 @@ public class GridNearGetResponse<K, V> extends GridCacheMessage<K, V> implements
                 if (buf.remaining() < 8)
                     return false;
 
-                topVer = commState.getLong(null);
+                topVer = commState.getLong("topVer");
 
                 commState.idx++;
 
             case 9:
-                GridCacheVersion ver0 = commState.getCacheVersion(null);
+                GridCacheVersion ver0 = commState.getCacheVersion("ver");
 
                 if (ver0 == 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/near/GridNearLockRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockRequest.java
index 6f80471..68c76df 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockRequest.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockRequest.java
@@ -389,49 +389,49 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V>
                 commState.idx++;
 
             case 26:
-                if (!commState.putBoolean(null, implicitSingleTx))
+                if (!commState.putBoolean("implicitSingleTx", implicitSingleTx))
                     return false;
 
                 commState.idx++;
 
             case 27:
-                if (!commState.putBoolean(null, implicitTx))
+                if (!commState.putBoolean("implicitTx", implicitTx))
                     return false;
 
                 commState.idx++;
 
             case 28:
-                if (!commState.putGridUuid(null, miniId))
+                if (!commState.putGridUuid("miniId", miniId))
                     return false;
 
                 commState.idx++;
 
             case 29:
-                if (!commState.putBoolean(null, onePhaseCommit))
+                if (!commState.putBoolean("onePhaseCommit", onePhaseCommit))
                     return false;
 
                 commState.idx++;
 
             case 30:
-                if (!commState.putLong(null, topVer))
+                if (!commState.putLong("topVer", topVer))
                     return false;
 
                 commState.idx++;
 
             case 31:
-                if (!commState.putUuid(null, subjId))
+                if (!commState.putUuid("subjId", subjId))
                     return false;
 
                 commState.idx++;
 
             case 32:
-                if (!commState.putInt(null, taskNameHash))
+                if (!commState.putInt("taskNameHash", taskNameHash))
                     return false;
 
                 commState.idx++;
 
             case 33:
-                if (!commState.putBoolean(null, hasTransforms))
+                if (!commState.putBoolean("hasTransforms", hasTransforms))
                     return false;
 
                 commState.idx++;
@@ -512,7 +512,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V>
                 if (buf.remaining() < 1)
                     return false;
 
-                implicitSingleTx = commState.getBoolean(null);
+                implicitSingleTx = commState.getBoolean("implicitSingleTx");
 
                 commState.idx++;
 
@@ -520,12 +520,12 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V>
                 if (buf.remaining() < 1)
                     return false;
 
-                implicitTx = commState.getBoolean(null);
+                implicitTx = commState.getBoolean("implicitTx");
 
                 commState.idx++;
 
             case 28:
-                IgniteUuid miniId0 = commState.getGridUuid(null);
+                IgniteUuid miniId0 = commState.getGridUuid("miniId");
 
                 if (miniId0 == GRID_UUID_NOT_READ)
                     return false;
@@ -538,7 +538,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V>
                 if (buf.remaining() < 1)
                     return false;
 
-                onePhaseCommit = commState.getBoolean(null);
+                onePhaseCommit = commState.getBoolean("onePhaseCommit");
 
                 commState.idx++;
 
@@ -546,12 +546,12 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V>
                 if (buf.remaining() < 8)
                     return false;
 
-                topVer = commState.getLong(null);
+                topVer = commState.getLong("topVer");
 
                 commState.idx++;
 
             case 31:
-                UUID subjId0 = commState.getUuid(null);
+                UUID subjId0 = commState.getUuid("subjId");
 
                 if (subjId0 == UUID_NOT_READ)
                     return false;
@@ -564,7 +564,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V>
                 if (buf.remaining() < 4)
                     return false;
 
-                taskNameHash = commState.getInt(null);
+                taskNameHash = commState.getInt("taskNameHash");
 
                 commState.idx++;
 
@@ -572,7 +572,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V>
                 if (buf.remaining() < 1)
                     return false;
 
-                hasTransforms = commState.getBoolean(null);
+                hasTransforms = commState.getBoolean("hasTransforms");
 
                 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/near/GridNearLockResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockResponse.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockResponse.java
index f5476fc..9c0a0b0 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockResponse.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockResponse.java
@@ -237,7 +237,7 @@ public class GridNearLockResponse<K, V> extends GridDistributedLockResponse<K, V
                 commState.idx++;
 
             case 12:
-                if (!commState.putBooleanArray(null, filterRes))
+                if (!commState.putBooleanArray("filterRes", filterRes))
                     return false;
 
                 commState.idx++;
@@ -270,7 +270,7 @@ public class GridNearLockResponse<K, V> extends GridDistributedLockResponse<K, V
                 commState.idx++;
 
             case 14:
-                if (!commState.putGridUuid(null, miniId))
+                if (!commState.putGridUuid("miniId", miniId))
                     return false;
 
                 commState.idx++;
@@ -346,7 +346,7 @@ public class GridNearLockResponse<K, V> extends GridDistributedLockResponse<K, V
                 commState.idx++;
 
             case 12:
-                boolean[] filterRes0 = commState.getBooleanArray(null);
+                boolean[] filterRes0 = commState.getBooleanArray("filterRes");
 
                 if (filterRes0 == BOOLEAN_ARR_NOT_READ)
                     return false;
@@ -385,7 +385,7 @@ public class GridNearLockResponse<K, V> extends GridDistributedLockResponse<K, V
                 commState.idx++;
 
             case 14:
-                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/near/GridNearTxFinishRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxFinishRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxFinishRequest.java
index b63b038..4164788 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxFinishRequest.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxFinishRequest.java
@@ -176,31 +176,31 @@ public class GridNearTxFinishRequest<K, V> extends GridDistributedTxFinishReques
 
         switch (commState.idx) {
             case 20:
-                if (!commState.putBoolean(null, explicitLock))
+                if (!commState.putBoolean("explicitLock", explicitLock))
                     return false;
 
                 commState.idx++;
 
             case 21:
-                if (!commState.putGridUuid(null, miniId))
+                if (!commState.putGridUuid("miniId", miniId))
                     return false;
 
                 commState.idx++;
 
             case 22:
-                if (!commState.putLong(null, topVer))
+                if (!commState.putLong("topVer", topVer))
                     return false;
 
                 commState.idx++;
 
             case 23:
-                if (!commState.putUuid(null, subjId))
+                if (!commState.putUuid("subjId", subjId))
                     return false;
 
                 commState.idx++;
 
             case 24:
-                if (!commState.putInt(null, taskNameHash))
+                if (!commState.putInt("taskNameHash", taskNameHash))
                     return false;
 
                 commState.idx++;
@@ -223,12 +223,12 @@ public class GridNearTxFinishRequest<K, V> extends GridDistributedTxFinishReques
                 if (buf.remaining() < 1)
                     return false;
 
-                explicitLock = commState.getBoolean(null);
+                explicitLock = commState.getBoolean("explicitLock");
 
                 commState.idx++;
 
             case 21:
-                IgniteUuid miniId0 = commState.getGridUuid(null);
+                IgniteUuid miniId0 = commState.getGridUuid("miniId");
 
                 if (miniId0 == GRID_UUID_NOT_READ)
                     return false;
@@ -241,12 +241,12 @@ public class GridNearTxFinishRequest<K, V> extends GridDistributedTxFinishReques
                 if (buf.remaining() < 8)
                     return false;
 
-                topVer = commState.getLong(null);
+                topVer = commState.getLong("topVer");
 
                 commState.idx++;
 
             case 23:
-                UUID subjId0 = commState.getUuid(null);
+                UUID subjId0 = commState.getUuid("subjId");
 
                 if (subjId0 == UUID_NOT_READ)
                     return false;
@@ -259,7 +259,7 @@ public class GridNearTxFinishRequest<K, V> extends GridDistributedTxFinishReques
                 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/near/GridNearTxFinishResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxFinishResponse.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxFinishResponse.java
index b093106..93629bf 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxFinishResponse.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxFinishResponse.java
@@ -143,19 +143,19 @@ public class GridNearTxFinishResponse<K, V> extends GridDistributedTxFinishRespo
 
         switch (commState.idx) {
             case 5:
-                if (!commState.putByteArray(null, errBytes))
+                if (!commState.putByteArray("errBytes", errBytes))
                     return false;
 
                 commState.idx++;
 
             case 6:
-                if (!commState.putGridUuid(null, miniId))
+                if (!commState.putGridUuid("miniId", miniId))
                     return false;
 
                 commState.idx++;
 
             case 7:
-                if (!commState.putLong(null, nearThreadId))
+                if (!commState.putLong("nearThreadId", nearThreadId))
                     return false;
 
                 commState.idx++;
@@ -175,7 +175,7 @@ public class GridNearTxFinishResponse<K, V> extends GridDistributedTxFinishRespo
 
         switch (commState.idx) {
             case 5:
-                byte[] errBytes0 = commState.getByteArray(null);
+                byte[] errBytes0 = commState.getByteArray("errBytes");
 
                 if (errBytes0 == BYTE_ARR_NOT_READ)
                     return false;
@@ -185,7 +185,7 @@ public class GridNearTxFinishResponse<K, V> extends GridDistributedTxFinishRespo
                 commState.idx++;
 
             case 6:
-                IgniteUuid miniId0 = commState.getGridUuid(null);
+                IgniteUuid miniId0 = commState.getGridUuid("miniId");
 
                 if (miniId0 == GRID_UUID_NOT_READ)
                     return false;
@@ -198,7 +198,7 @@ public class GridNearTxFinishResponse<K, V> extends GridDistributedTxFinishRespo
                 if (buf.remaining() < 8)
                     return false;
 
-                nearThreadId = commState.getLong(null);
+                nearThreadId = commState.getLong("nearThreadId");
 
                 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/near/GridNearTxPrepareRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxPrepareRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
index 7decc5e..ab51ff3 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
@@ -219,6 +219,7 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ
 
         _clone.futId = futId;
         _clone.miniId = miniId;
+        _clone.near = near;
         _clone.topVer = topVer;
         _clone.last = last;
         _clone.lastBackups = lastBackups;
@@ -243,13 +244,13 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ
 
         switch (commState.idx) {
             case 21:
-                if (!commState.putGridUuid(null, futId))
+                if (!commState.putGridUuid("futId", futId))
                     return false;
 
                 commState.idx++;
 
             case 22:
-                if (!commState.putBoolean(null, last))
+                if (!commState.putBoolean("last", last))
                     return false;
 
                 commState.idx++;
@@ -282,31 +283,31 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ
                 commState.idx++;
 
             case 24:
-                if (!commState.putGridUuid(null, miniId))
+                if (!commState.putGridUuid("miniId", miniId))
                     return false;
 
                 commState.idx++;
 
             case 25:
-                if (!commState.putBoolean(null, near))
+                if (!commState.putBoolean("near", near))
                     return false;
 
                 commState.idx++;
 
             case 26:
-                if (!commState.putLong(null, topVer))
+                if (!commState.putLong("topVer", topVer))
                     return false;
 
                 commState.idx++;
 
             case 27:
-                if (!commState.putUuid(null, subjId))
+                if (!commState.putUuid("subjId", subjId))
                     return false;
 
                 commState.idx++;
 
             case 28:
-                if (!commState.putInt(null, taskNameHash))
+                if (!commState.putInt("taskNameHash", taskNameHash))
                     return false;
 
                 commState.idx++;
@@ -326,7 +327,7 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ
 
         switch (commState.idx) {
             case 21:
-                IgniteUuid futId0 = commState.getGridUuid(null);
+                IgniteUuid futId0 = commState.getGridUuid("futId");
 
                 if (futId0 == GRID_UUID_NOT_READ)
                     return false;
@@ -339,7 +340,7 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ
                 if (buf.remaining() < 1)
                     return false;
 
-                last = commState.getBoolean(null);
+                last = commState.getBoolean("last");
 
                 commState.idx++;
 
@@ -373,7 +374,7 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ
                 commState.idx++;
 
             case 24:
-                IgniteUuid miniId0 = commState.getGridUuid(null);
+                IgniteUuid miniId0 = commState.getGridUuid("miniId");
 
                 if (miniId0 == GRID_UUID_NOT_READ)
                     return false;
@@ -386,7 +387,7 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ
                 if (buf.remaining() < 1)
                     return false;
 
-                near = commState.getBoolean(null);
+                near = commState.getBoolean("near");
 
                 commState.idx++;
 
@@ -394,12 +395,12 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ
                 if (buf.remaining() < 8)
                     return false;
 
-                topVer = commState.getLong(null);
+                topVer = commState.getLong("topVer");
 
                 commState.idx++;
 
             case 27:
-                UUID subjId0 = commState.getUuid(null);
+                UUID subjId0 = commState.getUuid("subjId");
 
                 if (subjId0 == UUID_NOT_READ)
                     return false;
@@ -412,7 +413,7 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ
                 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/near/GridNearTxPrepareResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxPrepareResponse.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
index ea475a9..70719d5 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
@@ -255,13 +255,13 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes
 
         switch (commState.idx) {
             case 10:
-                if (!commState.putCacheVersion(null, dhtVer))
+                if (!commState.putCacheVersion("dhtVer", dhtVer))
                     return false;
 
                 commState.idx++;
 
             case 11:
-                if (!commState.putGridUuid(null, futId))
+                if (!commState.putGridUuid("futId", futId))
                     return false;
 
                 commState.idx++;
@@ -294,7 +294,7 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes
                 commState.idx++;
 
             case 13:
-                if (!commState.putGridUuid(null, miniId))
+                if (!commState.putGridUuid("miniId", miniId))
                     return false;
 
                 commState.idx++;
@@ -368,7 +368,7 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes
 
         switch (commState.idx) {
             case 10:
-                GridCacheVersion dhtVer0 = commState.getCacheVersion(null);
+                GridCacheVersion dhtVer0 = commState.getCacheVersion("dhtVer");
 
                 if (dhtVer0 == CACHE_VER_NOT_READ)
                     return false;
@@ -378,7 +378,7 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes
                 commState.idx++;
 
             case 11:
-                IgniteUuid futId0 = commState.getGridUuid(null);
+                IgniteUuid futId0 = commState.getGridUuid("futId");
 
                 if (futId0 == GRID_UUID_NOT_READ)
                     return false;
@@ -417,7 +417,7 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes
                 commState.idx++;
 
             case 13:
-                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/query/GridCacheQueryRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheQueryRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheQueryRequest.java
index 4318df6..4614513 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheQueryRequest.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheQueryRequest.java
@@ -494,115 +494,115 @@ public class GridCacheQueryRequest<K, V> extends GridCacheMessage<K, V> implemen
 
         switch (commState.idx) {
             case 3:
-                if (!commState.putBoolean(null, all))
+                if (!commState.putBoolean("all", all))
                     return false;
 
                 commState.idx++;
 
             case 4:
-                if (!commState.putByteArray(null, argsBytes))
+                if (!commState.putByteArray("argsBytes", argsBytes))
                     return false;
 
                 commState.idx++;
 
             case 5:
-                if (!commState.putString(null, cacheName))
+                if (!commState.putString("cacheName", cacheName))
                     return false;
 
                 commState.idx++;
 
             case 6:
-                if (!commState.putBoolean(null, cancel))
+                if (!commState.putBoolean("cancel", cancel))
                     return false;
 
                 commState.idx++;
 
             case 7:
-                if (!commState.putString(null, clause))
+                if (!commState.putString("clause", clause))
                     return false;
 
                 commState.idx++;
 
             case 8:
-                if (!commState.putString(null, clsName))
+                if (!commState.putString("clsName", clsName))
                     return false;
 
                 commState.idx++;
 
             case 9:
-                if (!commState.putBoolean(null, fields))
+                if (!commState.putBoolean("fields", fields))
                     return false;
 
                 commState.idx++;
 
             case 10:
-                if (!commState.putLong(null, id))
+                if (!commState.putLong("id", id))
                     return false;
 
                 commState.idx++;
 
             case 11:
-                if (!commState.putBoolean(null, incBackups))
+                if (!commState.putBoolean("incBackups", incBackups))
                     return false;
 
                 commState.idx++;
 
             case 12:
-                if (!commState.putBoolean(null, incMeta))
+                if (!commState.putBoolean("incMeta", incMeta))
                     return false;
 
                 commState.idx++;
 
             case 13:
-                if (!commState.putByteArray(null, keyValFilterBytes))
+                if (!commState.putByteArray("keyValFilterBytes", keyValFilterBytes))
                     return false;
 
                 commState.idx++;
 
             case 14:
-                if (!commState.putInt(null, pageSize))
+                if (!commState.putInt("pageSize", pageSize))
                     return false;
 
                 commState.idx++;
 
             case 15:
-                if (!commState.putByteArray(null, prjFilterBytes))
+                if (!commState.putByteArray("prjFilterBytes", prjFilterBytes))
                     return false;
 
                 commState.idx++;
 
             case 16:
-                if (!commState.putByteArray(null, rdcBytes))
+                if (!commState.putByteArray("rdcBytes", rdcBytes))
                     return false;
 
                 commState.idx++;
 
             case 17:
-                if (!commState.putByteArray(null, transBytes))
+                if (!commState.putByteArray("transBytes", transBytes))
                     return false;
 
                 commState.idx++;
 
             case 18:
-                if (!commState.putEnum(null, type))
+                if (!commState.putEnum("type", type))
                     return false;
 
                 commState.idx++;
 
             case 19:
-                if (!commState.putBoolean(null, keepPortable))
+                if (!commState.putBoolean("keepPortable", keepPortable))
                     return false;
 
                 commState.idx++;
 
             case 20:
-                if (!commState.putUuid(null, subjId))
+                if (!commState.putUuid("subjId", subjId))
                     return false;
 
                 commState.idx++;
 
             case 21:
-                if (!commState.putInt(null, taskHash))
+                if (!commState.putInt("taskHash", taskHash))
                     return false;
 
                 commState.idx++;
@@ -625,12 +625,12 @@ public class GridCacheQueryRequest<K, V> extends GridCacheMessage<K, V> implemen
                 if (buf.remaining() < 1)
                     return false;
 
-                all = commState.getBoolean(null);
+                all = commState.getBoolean("all");
 
                 commState.idx++;
 
             case 4:
-                byte[] argsBytes0 = commState.getByteArray(null);
+                byte[] argsBytes0 = commState.getByteArray("argsBytes");
 
                 if (argsBytes0 == BYTE_ARR_NOT_READ)
                     return false;
@@ -640,7 +640,7 @@ public class GridCacheQueryRequest<K, V> extends GridCacheMessage<K, V> implemen
                 commState.idx++;
 
             case 5:
-                String cacheName0 = commState.getString(null);
+                String cacheName0 = commState.getString("cacheName");
 
                 if (cacheName0 == STR_NOT_READ)
                     return false;
@@ -653,12 +653,12 @@ public class GridCacheQueryRequest<K, V> extends GridCacheMessage<K, V> implemen
                 if (buf.remaining() < 1)
                     return false;
 
-                cancel = commState.getBoolean(null);
+                cancel = commState.getBoolean("cancel");
 
                 commState.idx++;
 
             case 7:
-                String clause0 = commState.getString(null);
+                String clause0 = commState.getString("clause");
 
                 if (clause0 == STR_NOT_READ)
                     return false;
@@ -668,7 +668,7 @@ public class GridCacheQueryRequest<K, V> extends GridCacheMessage<K, V> implemen
                 commState.idx++;
 
             case 8:
-                String clsName0 = commState.getString(null);
+                String clsName0 = commState.getString("clsName");
 
                 if (clsName0 == STR_NOT_READ)
                     return false;
@@ -681,7 +681,7 @@ public class GridCacheQueryRequest<K, V> extends GridCacheMessage<K, V> implemen
                 if (buf.remaining() < 1)
                     return false;
 
-                fields = commState.getBoolean(null);
+                fields = commState.getBoolean("fields");
 
                 commState.idx++;
 
@@ -689,7 +689,7 @@ public class GridCacheQueryRequest<K, V> extends GridCacheMessage<K, V> implemen
                 if (buf.remaining() < 8)
                     return false;
 
-                id = commState.getLong(null);
+                id = commState.getLong("id");
 
                 commState.idx++;
 
@@ -697,7 +697,7 @@ public class GridCacheQueryRequest<K, V> extends GridCacheMessage<K, V> implemen
                 if (buf.remaining() < 1)
                     return false;
 
-                incBackups = commState.getBoolean(null);
+                incBackups = commState.getBoolean("incBackups");
 
                 commState.idx++;
 
@@ -705,12 +705,12 @@ public class GridCacheQueryRequest<K, V> extends GridCacheMessage<K, V> implemen
                 if (buf.remaining() < 1)
                     return false;
 
-                incMeta = commState.getBoolean(null);
+                incMeta = commState.getBoolean("incMeta");
 
                 commState.idx++;
 
             case 13:
-                byte[] keyValFilterBytes0 = commState.getByteArray(null);
+                byte[] keyValFilterBytes0 = commState.getByteArray("keyValFilterBytes");
 
                 if (keyValFilterBytes0 == BYTE_ARR_NOT_READ)
                     return false;
@@ -723,12 +723,12 @@ public class GridCacheQueryRequest<K, V> extends GridCacheMessage<K, V> implemen
                 if (buf.remaining() < 4)
                     return false;
 
-                pageSize = commState.getInt(null);
+                pageSize = commState.getInt("pageSize");
 
                 commState.idx++;
 
             case 15:
-                byte[] prjFilterBytes0 = commState.getByteArray(null);
+                byte[] prjFilterBytes0 = commState.getByteArray("prjFilterBytes");
 
                 if (prjFilterBytes0 == BYTE_ARR_NOT_READ)
                     return false;
@@ -738,7 +738,7 @@ public class GridCacheQueryRequest<K, V> extends GridCacheMessage<K, V> implemen
                 commState.idx++;
 
             case 16:
-                byte[] rdcBytes0 = commState.getByteArray(null);
+                byte[] rdcBytes0 = commState.getByteArray("rdcBytes");
 
                 if (rdcBytes0 == BYTE_ARR_NOT_READ)
                     return false;
@@ -748,7 +748,7 @@ public class GridCacheQueryRequest<K, V> extends GridCacheMessage<K, V> implemen
                 commState.idx++;
 
             case 17:
-                byte[] transBytes0 = commState.getByteArray(null);
+                byte[] transBytes0 = commState.getByteArray("transBytes");
 
                 if (transBytes0 == BYTE_ARR_NOT_READ)
                     return false;
@@ -761,7 +761,7 @@ public class GridCacheQueryRequest<K, V> extends GridCacheMessage<K, V> implemen
                 if (buf.remaining() < 1)
                     return false;
 
-                byte type0 = commState.getByte(null);
+                byte type0 = commState.getByte("type");
 
                 type = GridCacheQueryType.fromOrdinal(type0);
 
@@ -771,12 +771,12 @@ public class GridCacheQueryRequest<K, V> extends GridCacheMessage<K, V> implemen
                 if (buf.remaining() < 1)
                     return false;
 
-                keepPortable = commState.getBoolean(null);
+                keepPortable = commState.getBoolean("keepPortable");
 
                 commState.idx++;
 
             case 20:
-                UUID subjId0 = commState.getUuid(null);
+                UUID subjId0 = commState.getUuid("subjId");
 
                 if (subjId0 == UUID_NOT_READ)
                     return false;
@@ -789,7 +789,7 @@ public class GridCacheQueryRequest<K, V> extends GridCacheMessage<K, V> implemen
                 if (buf.remaining() < 4)
                     return false;
 
-                taskHash = commState.getInt(null);
+                taskHash = commState.getInt("taskHash");
 
                 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/query/GridCacheQueryResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheQueryResponse.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheQueryResponse.java
index 0254c6d..825a575 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheQueryResponse.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheQueryResponse.java
@@ -264,19 +264,19 @@ public class GridCacheQueryResponse<K, V> extends GridCacheMessage<K, V> impleme
                 commState.idx++;
 
             case 4:
-                if (!commState.putByteArray(null, errBytes))
+                if (!commState.putByteArray("errBytes", errBytes))
                     return false;
 
                 commState.idx++;
 
             case 5:
-                if (!commState.putBoolean(null, fields))
+                if (!commState.putBoolean("fields", fields))
                     return false;
 
                 commState.idx++;
 
             case 6:
-                if (!commState.putBoolean(null, finished))
+                if (!commState.putBoolean("finished", finished))
                     return false;
 
                 commState.idx++;
@@ -309,7 +309,7 @@ public class GridCacheQueryResponse<K, V> extends GridCacheMessage<K, V> impleme
                 commState.idx++;
 
             case 8:
-                if (!commState.putLong(null, reqId))
+                if (!commState.putLong("reqId", reqId))
                     return false;
 
                 commState.idx++;
@@ -358,7 +358,7 @@ public class GridCacheQueryResponse<K, V> extends GridCacheMessage<K, V> impleme
                 commState.idx++;
 
             case 4:
-                byte[] errBytes0 = commState.getByteArray(null);
+                byte[] errBytes0 = commState.getByteArray("errBytes");
 
                 if (errBytes0 == BYTE_ARR_NOT_READ)
                     return false;
@@ -371,7 +371,7 @@ public class GridCacheQueryResponse<K, V> extends GridCacheMessage<K, V> impleme
                 if (buf.remaining() < 1)
                     return false;
 
-                fields = commState.getBoolean(null);
+                fields = commState.getBoolean("fields");
 
                 commState.idx++;
 
@@ -379,7 +379,7 @@ public class GridCacheQueryResponse<K, V> extends GridCacheMessage<K, V> impleme
                 if (buf.remaining() < 1)
                     return false;
 
-                finished = commState.getBoolean(null);
+                finished = commState.getBoolean("finished");
 
                 commState.idx++;
 
@@ -416,7 +416,7 @@ public class GridCacheQueryResponse<K, V> extends GridCacheMessage<K, V> impleme
                 if (buf.remaining() < 8)
                     return false;
 
-                reqId = commState.getLong(null);
+                reqId = commState.getLong("reqId");
 
                 commState.idx++;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5b3f26e/modules/core/src/main/java/org/gridgain/grid/kernal/processors/clock/GridClockDeltaSnapshotMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/clock/GridClockDeltaSnapshotMessage.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/clock/GridClockDeltaSnapshotMessage.java
index f3a61c8..cca184b 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/clock/GridClockDeltaSnapshotMessage.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/clock/GridClockDeltaSnapshotMessage.java
@@ -133,7 +133,7 @@ public class GridClockDeltaSnapshotMessage extends GridTcpCommunicationMessageAd
                 commState.idx++;
 
             case 1:
-                if (!commState.putClockDeltaVersion(null, snapVer))
+                if (!commState.putClockDeltaVersion("snapVer", snapVer))
                     return false;
 
                 commState.idx++;
@@ -159,7 +159,7 @@ public class GridClockDeltaSnapshotMessage extends GridTcpCommunicationMessageAd
 
                 if (commState.readSize >= 0) {
                     if (deltas == null)
-                        deltas = U.newHashMap(commState.readSize);
+                        deltas = new HashMap<>(commState.readSize, 1.0f);
 
                     for (int i = commState.readItems; i < commState.readSize; i++) {
                         if (!commState.keyDone) {
@@ -192,7 +192,7 @@ public class GridClockDeltaSnapshotMessage extends GridTcpCommunicationMessageAd
                 commState.idx++;
 
             case 1:
-                GridClockDeltaVersion snapVer0 = commState.getClockDeltaVersion(null);
+                GridClockDeltaVersion snapVer0 = commState.getClockDeltaVersion("snapVer");
 
                 if (snapVer0 == CLOCK_DELTA_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/continuous/GridContinuousMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/continuous/GridContinuousMessage.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/continuous/GridContinuousMessage.java
index e87e972..6f0ef14 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/continuous/GridContinuousMessage.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/continuous/GridContinuousMessage.java
@@ -106,11 +106,11 @@ public class GridContinuousMessage extends GridTcpCommunicationMessageAdapter {
     /** {@inheritDoc} */
     @SuppressWarnings({"CloneDoesntCallSuperClone", "CloneCallsConstructors"})
     @Override public GridTcpCommunicationMessageAdapter clone() {
-        GridContinuousMessage clone = new GridContinuousMessage();
+        GridContinuousMessage _clone = new GridContinuousMessage();
 
-        clone0(clone);
+        clone0(_clone);
 
-        return clone;
+        return _clone;
     }
 
     /** {@inheritDoc} */
@@ -137,19 +137,19 @@ public class GridContinuousMessage extends GridTcpCommunicationMessageAdapter {
 
         switch (commState.idx) {
             case 0:
-                if (!commState.putByteArray(null, dataBytes))
+                if (!commState.putByteArray("dataBytes", dataBytes))
                     return false;
 
                 commState.idx++;
 
             case 1:
-                if (!commState.putUuid(null, routineId))
+                if (!commState.putUuid("routineId", routineId))
                     return false;
 
                 commState.idx++;
 
             case 2:
-                if (!commState.putEnum(null, type))
+                if (!commState.putEnum("type", type))
                     return false;
 
                 commState.idx++;
@@ -166,7 +166,7 @@ public class GridContinuousMessage extends GridTcpCommunicationMessageAdapter {
 
         switch (commState.idx) {
             case 0:
-                byte[] dataBytes0 = commState.getByteArray(null);
+                byte[] dataBytes0 = commState.getByteArray("dataBytes");
 
                 if (dataBytes0 == BYTE_ARR_NOT_READ)
                     return false;
@@ -176,7 +176,7 @@ public class GridContinuousMessage extends GridTcpCommunicationMessageAdapter {
                 commState.idx++;
 
             case 1:
-                UUID routineId0 = commState.getUuid(null);
+                UUID routineId0 = commState.getUuid("routineId");
 
                 if (routineId0 == UUID_NOT_READ)
                     return false;
@@ -189,7 +189,7 @@ public class GridContinuousMessage extends GridTcpCommunicationMessageAdapter {
                 if (buf.remaining() < 1)
                     return false;
 
-                byte type0 = commState.getByte(null);
+                byte type0 = commState.getByte("type");
 
                 type = GridContinuousMessageType.fromOrdinal(type0);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5b3f26e/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoadRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoadRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoadRequest.java
index 7810633..d7b815e 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoadRequest.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoadRequest.java
@@ -214,37 +214,37 @@ public class GridDataLoadRequest<K, V> extends GridTcpCommunicationMessageAdapte
 
         switch (commState.idx) {
             case 0:
-                if (!commState.putString(null, cacheName))
+                if (!commState.putString("cacheName", cacheName))
                     return false;
 
                 commState.idx++;
 
             case 1:
-                if (!commState.putGridUuid(null, clsLdrId))
+                if (!commState.putGridUuid("clsLdrId", clsLdrId))
                     return false;
 
                 commState.idx++;
 
             case 2:
-                if (!commState.putByteArray(null, colBytes))
+                if (!commState.putByteArray("colBytes", colBytes))
                     return false;
 
                 commState.idx++;
 
             case 3:
-                if (!commState.putEnum(null, depMode))
+                if (!commState.putEnum("depMode", depMode))
                     return false;
 
                 commState.idx++;
 
             case 4:
-                if (!commState.putBoolean(null, forceLocDep))
+                if (!commState.putBoolean("forceLocDep", forceLocDep))
                     return false;
 
                 commState.idx++;
 
             case 5:
-                if (!commState.putBoolean(null, ignoreDepOwnership))
+                if (!commState.putBoolean("ignoreDepOwnership", ignoreDepOwnership))
                     return false;
 
                 commState.idx++;
@@ -288,31 +288,31 @@ public class GridDataLoadRequest<K, V> extends GridTcpCommunicationMessageAdapte
                 commState.idx++;
 
             case 7:
-                if (!commState.putLong(null, reqId))
+                if (!commState.putLong("reqId", reqId))
                     return false;
 
                 commState.idx++;
 
             case 8:
-                if (!commState.putByteArray(null, resTopicBytes))
+                if (!commState.putByteArray("resTopicBytes", resTopicBytes))
                     return false;
 
                 commState.idx++;
 
             case 9:
-                if (!commState.putString(null, sampleClsName))
+                if (!commState.putString("sampleClsName", sampleClsName))
                     return false;
 
                 commState.idx++;
 
             case 10:
-                if (!commState.putByteArray(null, updaterBytes))
+                if (!commState.putByteArray("updaterBytes", updaterBytes))
                     return false;
 
                 commState.idx++;
 
             case 11:
-                if (!commState.putString(null, userVer))
+                if (!commState.putString("userVer", userVer))
                     return false;
 
                 commState.idx++;
@@ -328,7 +328,7 @@ public class GridDataLoadRequest<K, V> extends GridTcpCommunicationMessageAdapte
 
         switch (commState.idx) {
             case 0:
-                String cacheName0 = commState.getString(null);
+                String cacheName0 = commState.getString("cacheName");
 
                 if (cacheName0 == STR_NOT_READ)
                     return false;
@@ -338,7 +338,7 @@ public class GridDataLoadRequest<K, V> extends GridTcpCommunicationMessageAdapte
                 commState.idx++;
 
             case 1:
-                IgniteUuid clsLdrId0 = commState.getGridUuid(null);
+                IgniteUuid clsLdrId0 = commState.getGridUuid("clsLdrId");
 
                 if (clsLdrId0 == GRID_UUID_NOT_READ)
                     return false;
@@ -348,7 +348,7 @@ public class GridDataLoadRequest<K, V> extends GridTcpCommunicationMessageAdapte
                 commState.idx++;
 
             case 2:
-                byte[] colBytes0 = commState.getByteArray(null);
+                byte[] colBytes0 = commState.getByteArray("colBytes");
 
                 if (colBytes0 == BYTE_ARR_NOT_READ)
                     return false;
@@ -361,7 +361,7 @@ public class GridDataLoadRequest<K, V> extends GridTcpCommunicationMessageAdapte
                 if (buf.remaining() < 1)
                     return false;
 
-                byte depMode0 = commState.getByte(null);
+                byte depMode0 = commState.getByte("depMode");
 
                 depMode = IgniteDeploymentMode.fromOrdinal(depMode0);
 
@@ -371,7 +371,7 @@ public class GridDataLoadRequest<K, V> extends GridTcpCommunicationMessageAdapte
                 if (buf.remaining() < 1)
                     return false;
 
-                forceLocDep = commState.getBoolean(null);
+                forceLocDep = commState.getBoolean("forceLocDep");
 
                 commState.idx++;
 
@@ -379,7 +379,7 @@ public class GridDataLoadRequest<K, V> extends GridTcpCommunicationMessageAdapte
                 if (buf.remaining() < 1)
                     return false;
 
-                ignoreDepOwnership = commState.getBoolean(null);
+                ignoreDepOwnership = commState.getBoolean("ignoreDepOwnership");
 
                 commState.idx++;
 
@@ -393,7 +393,7 @@ public class GridDataLoadRequest<K, V> extends GridTcpCommunicationMessageAdapte
 
                 if (commState.readSize >= 0) {
                     if (ldrParticipants == null)
-                        ldrParticipants = U.newHashMap(commState.readSize);
+                        ldrParticipants = new HashMap<>(commState.readSize, 1.0f);
 
                     for (int i = commState.readItems; i < commState.readSize; i++) {
                         if (!commState.keyDone) {
@@ -429,12 +429,12 @@ public class GridDataLoadRequest<K, V> extends GridTcpCommunicationMessageAdapte
                 if (buf.remaining() < 8)
                     return false;
 
-                reqId = commState.getLong(null);
+                reqId = commState.getLong("reqId");
 
                 commState.idx++;
 
             case 8:
-                byte[] resTopicBytes0 = commState.getByteArray(null);
+                byte[] resTopicBytes0 = commState.getByteArray("resTopicBytes");
 
                 if (resTopicBytes0 == BYTE_ARR_NOT_READ)
                     return false;
@@ -444,7 +444,7 @@ public class GridDataLoadRequest<K, V> extends GridTcpCommunicationMessageAdapte
                 commState.idx++;
 
             case 9:
-                String sampleClsName0 = commState.getString(null);
+                String sampleClsName0 = commState.getString("sampleClsName");
 
                 if (sampleClsName0 == STR_NOT_READ)
                     return false;
@@ -454,7 +454,7 @@ public class GridDataLoadRequest<K, V> extends GridTcpCommunicationMessageAdapte
                 commState.idx++;
 
             case 10:
-                byte[] updaterBytes0 = commState.getByteArray(null);
+                byte[] updaterBytes0 = commState.getByteArray("updaterBytes");
 
                 if (updaterBytes0 == BYTE_ARR_NOT_READ)
                     return false;
@@ -464,7 +464,7 @@ public class GridDataLoadRequest<K, V> extends GridTcpCommunicationMessageAdapte
                 commState.idx++;
 
             case 11:
-                String userVer0 = commState.getString(null);
+                String userVer0 = commState.getString("userVer");
 
                 if (userVer0 == STR_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/dataload/GridDataLoadResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoadResponse.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoadResponse.java
index f726db8..46bab85 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoadResponse.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoadResponse.java
@@ -107,19 +107,19 @@ public class GridDataLoadResponse extends GridTcpCommunicationMessageAdapter {
 
         switch (commState.idx) {
             case 0:
-                if (!commState.putByteArray(null, errBytes))
+                if (!commState.putByteArray("errBytes", errBytes))
                     return false;
 
                 commState.idx++;
 
             case 1:
-                if (!commState.putBoolean(null, forceLocDep))
+                if (!commState.putBoolean("forceLocDep", forceLocDep))
                     return false;
 
                 commState.idx++;
 
             case 2:
-                if (!commState.putLong(null, reqId))
+                if (!commState.putLong("reqId", reqId))
                     return false;
 
                 commState.idx++;
@@ -136,7 +136,7 @@ public class GridDataLoadResponse extends GridTcpCommunicationMessageAdapter {
 
         switch (commState.idx) {
             case 0:
-                byte[] errBytes0 = commState.getByteArray(null);
+                byte[] errBytes0 = commState.getByteArray("errBytes");
 
                 if (errBytes0 == BYTE_ARR_NOT_READ)
                     return false;
@@ -149,7 +149,7 @@ public class GridDataLoadResponse extends GridTcpCommunicationMessageAdapter {
                 if (buf.remaining() < 1)
                     return false;
 
-                forceLocDep = commState.getBoolean(null);
+                forceLocDep = commState.getBoolean("forceLocDep");
 
                 commState.idx++;
 
@@ -157,7 +157,7 @@ public class GridDataLoadResponse extends GridTcpCommunicationMessageAdapter {
                 if (buf.remaining() < 8)
                     return false;
 
-                reqId = commState.getLong(null);
+                reqId = commState.getLong("reqId");
 
                 commState.idx++;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5b3f26e/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAckMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAckMessage.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAckMessage.java
index f01b397..d3cb730 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAckMessage.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAckMessage.java
@@ -133,19 +133,19 @@ public class GridGgfsAckMessage extends GridGgfsCommunicationMessage {
 
         switch (commState.idx) {
             case 0:
-                if (!commState.putByteArray(null, errBytes))
+                if (!commState.putByteArray("errBytes", errBytes))
                     return false;
 
                 commState.idx++;
 
             case 1:
-                if (!commState.putGridUuid(null, fileId))
+                if (!commState.putGridUuid("fileId", fileId))
                     return false;
 
                 commState.idx++;
 
             case 2:
-                if (!commState.putLong(null, id))
+                if (!commState.putLong("id", id))
                     return false;
 
                 commState.idx++;
@@ -165,7 +165,7 @@ public class GridGgfsAckMessage extends GridGgfsCommunicationMessage {
 
         switch (commState.idx) {
             case 0:
-                byte[] errBytes0 = commState.getByteArray(null);
+                byte[] errBytes0 = commState.getByteArray("errBytes");
 
                 if (errBytes0 == BYTE_ARR_NOT_READ)
                     return false;
@@ -175,7 +175,7 @@ public class GridGgfsAckMessage extends GridGgfsCommunicationMessage {
                 commState.idx++;
 
             case 1:
-                IgniteUuid fileId0 = commState.getGridUuid(null);
+                IgniteUuid fileId0 = commState.getGridUuid("fileId");
 
                 if (fileId0 == GRID_UUID_NOT_READ)
                     return false;
@@ -188,7 +188,7 @@ public class GridGgfsAckMessage extends GridGgfsCommunicationMessage {
                 if (buf.remaining() < 8)
                     return false;
 
-                id = commState.getLong(null);
+                id = commState.getLong("id");
 
                 commState.idx++;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5b3f26e/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsBlockKey.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsBlockKey.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsBlockKey.java
index 563c458..0675e7b 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsBlockKey.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsBlockKey.java
@@ -184,25 +184,25 @@ public final class GridGgfsBlockKey extends GridTcpCommunicationMessageAdapter
 
         switch (commState.idx) {
             case 0:
-                if (!commState.putGridUuid(null, affKey))
+                if (!commState.putGridUuid("affKey", affKey))
                     return false;
 
                 commState.idx++;
 
             case 1:
-                if (!commState.putLong(null, blockId))
+                if (!commState.putLong("blockId", blockId))
                     return false;
 
                 commState.idx++;
 
             case 2:
-                if (!commState.putBoolean(null, evictExclude))
+                if (!commState.putBoolean("evictExclude", evictExclude))
                     return false;
 
                 commState.idx++;
 
             case 3:
-                if (!commState.putGridUuid(null, fileId))
+                if (!commState.putGridUuid("fileId", fileId))
                     return false;
 
                 commState.idx++;
@@ -219,7 +219,7 @@ public final class GridGgfsBlockKey extends GridTcpCommunicationMessageAdapter
 
         switch (commState.idx) {
             case 0:
-                IgniteUuid affKey0 = commState.getGridUuid(null);
+                IgniteUuid affKey0 = commState.getGridUuid("affKey");
 
                 if (affKey0 == GRID_UUID_NOT_READ)
                     return false;
@@ -232,7 +232,7 @@ public final class GridGgfsBlockKey extends GridTcpCommunicationMessageAdapter
                 if (buf.remaining() < 8)
                     return false;
 
-                blockId = commState.getLong(null);
+                blockId = commState.getLong("blockId");
 
                 commState.idx++;
 
@@ -240,12 +240,12 @@ public final class GridGgfsBlockKey extends GridTcpCommunicationMessageAdapter
                 if (buf.remaining() < 1)
                     return false;
 
-                evictExclude = commState.getBoolean(null);
+                evictExclude = commState.getBoolean("evictExclude");
 
                 commState.idx++;
 
             case 3:
-                IgniteUuid fileId0 = commState.getGridUuid(null);
+                IgniteUuid fileId0 = commState.getGridUuid("fileId");
 
                 if (fileId0 == 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/ggfs/GridGgfsBlocksMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsBlocksMessage.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsBlocksMessage.java
index 2f9ea60..0b169a7 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsBlocksMessage.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsBlocksMessage.java
@@ -152,13 +152,13 @@ public class GridGgfsBlocksMessage extends GridGgfsCommunicationMessage {
                 commState.idx++;
 
             case 1:
-                if (!commState.putGridUuid(null, fileId))
+                if (!commState.putGridUuid("fileId", fileId))
                     return false;
 
                 commState.idx++;
 
             case 2:
-                if (!commState.putLong(null, id))
+                if (!commState.putLong("id", id))
                     return false;
 
                 commState.idx++;
@@ -187,7 +187,7 @@ public class GridGgfsBlocksMessage extends GridGgfsCommunicationMessage {
 
                 if (commState.readSize >= 0) {
                     if (blocks == null)
-                        blocks = U.newHashMap(commState.readSize);
+                        blocks = new HashMap<>(commState.readSize, 1.0f);
 
                     for (int i = commState.readItems; i < commState.readSize; i++) {
                         if (!commState.keyDone) {
@@ -220,7 +220,7 @@ public class GridGgfsBlocksMessage extends GridGgfsCommunicationMessage {
                 commState.idx++;
 
             case 1:
-                IgniteUuid fileId0 = commState.getGridUuid(null);
+                IgniteUuid fileId0 = commState.getGridUuid("fileId");
 
                 if (fileId0 == GRID_UUID_NOT_READ)
                     return false;
@@ -233,7 +233,7 @@ public class GridGgfsBlocksMessage extends GridGgfsCommunicationMessage {
                 if (buf.remaining() < 8)
                     return false;
 
-                id = commState.getLong(null);
+                id = commState.getLong("id");
 
                 commState.idx++;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5b3f26e/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDeleteMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDeleteMessage.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDeleteMessage.java
index c913132..e2fedec 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDeleteMessage.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDeleteMessage.java
@@ -136,13 +136,13 @@ public class GridGgfsDeleteMessage extends GridGgfsCommunicationMessage {
 
         switch (commState.idx) {
             case 0:
-                if (!commState.putByteArray(null, errBytes))
+                if (!commState.putByteArray("errBytes", errBytes))
                     return false;
 
                 commState.idx++;
 
             case 1:
-                if (!commState.putGridUuid(null, id))
+                if (!commState.putGridUuid("id", id))
                     return false;
 
                 commState.idx++;
@@ -162,7 +162,7 @@ public class GridGgfsDeleteMessage extends GridGgfsCommunicationMessage {
 
         switch (commState.idx) {
             case 0:
-                byte[] errBytes0 = commState.getByteArray(null);
+                byte[] errBytes0 = commState.getByteArray("errBytes");
 
                 if (errBytes0 == BYTE_ARR_NOT_READ)
                     return false;
@@ -172,7 +172,7 @@ public class GridGgfsDeleteMessage extends GridGgfsCommunicationMessage {
                 commState.idx++;
 
             case 1:
-                IgniteUuid id0 = commState.getGridUuid(null);
+                IgniteUuid id0 = commState.getGridUuid("id");
 
                 if (id0 == 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/ggfs/GridGgfsFileAffinityRange.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileAffinityRange.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileAffinityRange.java
index 46975bb..ce82844 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileAffinityRange.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileAffinityRange.java
@@ -289,31 +289,31 @@ public class GridGgfsFileAffinityRange extends GridTcpCommunicationMessageAdapte
 
         switch (commState.idx) {
             case 0:
-                if (!commState.putGridUuid(null, affKey))
+                if (!commState.putGridUuid("affKey", affKey))
                     return false;
 
                 commState.idx++;
 
             case 1:
-                if (!commState.putBoolean(null, done))
+                if (!commState.putBoolean("done", done))
                     return false;
 
                 commState.idx++;
 
             case 2:
-                if (!commState.putLong(null, endOff))
+                if (!commState.putLong("endOff", endOff))
                     return false;
 
                 commState.idx++;
 
             case 3:
-                if (!commState.putLong(null, startOff))
+                if (!commState.putLong("startOff", startOff))
                     return false;
 
                 commState.idx++;
 
             case 4:
-                if (!commState.putInt(null, status))
+                if (!commState.putInt("status", status))
                     return false;
 
                 commState.idx++;
@@ -330,7 +330,7 @@ public class GridGgfsFileAffinityRange extends GridTcpCommunicationMessageAdapte
 
         switch (commState.idx) {
             case 0:
-                IgniteUuid affKey0 = commState.getGridUuid(null);
+                IgniteUuid affKey0 = commState.getGridUuid("affKey");
 
                 if (affKey0 == GRID_UUID_NOT_READ)
                     return false;
@@ -343,7 +343,7 @@ public class GridGgfsFileAffinityRange extends GridTcpCommunicationMessageAdapte
                 if (buf.remaining() < 1)
                     return false;
 
-                done = commState.getBoolean(null);
+                done = commState.getBoolean("done");
 
                 commState.idx++;
 
@@ -351,7 +351,7 @@ public class GridGgfsFileAffinityRange extends GridTcpCommunicationMessageAdapte
                 if (buf.remaining() < 8)
                     return false;
 
-                endOff = commState.getLong(null);
+                endOff = commState.getLong("endOff");
 
                 commState.idx++;
 
@@ -359,7 +359,7 @@ public class GridGgfsFileAffinityRange extends GridTcpCommunicationMessageAdapte
                 if (buf.remaining() < 8)
                     return false;
 
-                startOff = commState.getLong(null);
+                startOff = commState.getLong("startOff");
 
                 commState.idx++;
 
@@ -367,7 +367,7 @@ public class GridGgfsFileAffinityRange extends GridTcpCommunicationMessageAdapte
                 if (buf.remaining() < 4)
                     return false;
 
-                status = commState.getInt(null);
+                status = commState.getInt("status");
 
                 commState.idx++;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5b3f26e/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFragmentizerRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFragmentizerRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFragmentizerRequest.java
index 80b4621..b35991b 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFragmentizerRequest.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFragmentizerRequest.java
@@ -107,7 +107,7 @@ public class GridGgfsFragmentizerRequest extends GridGgfsCommunicationMessage {
 
         switch (commState.idx) {
             case 0:
-                if (!commState.putGridUuid(null, fileId))
+                if (!commState.putGridUuid("fileId", fileId))
                     return false;
 
                 commState.idx++;
@@ -154,7 +154,7 @@ public class GridGgfsFragmentizerRequest extends GridGgfsCommunicationMessage {
 
         switch (commState.idx) {
             case 0:
-                IgniteUuid fileId0 = commState.getGridUuid(null);
+                IgniteUuid fileId0 = commState.getGridUuid("fileId");
 
                 if (fileId0 == GRID_UUID_NOT_READ)
                     return false;


Mime
View raw message