ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vkuliche...@apache.org
Subject [04/20] incubator-ignite git commit: IGNITE-61 - Portable format in direct marshalling
Date Mon, 22 Dec 2014 23:39:58 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d21e6b4b/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 00512ff..446a521 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
@@ -545,7 +545,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im
             return false;
 
         if (!commState.typeWritten) {
-            if (!commState.putByte(directType()))
+            if (!commState.putByte(null, directType()))
                 return false;
 
             commState.typeWritten = true;
@@ -553,13 +553,13 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im
 
         switch (commState.idx) {
             case 3:
-                if (!commState.putLongList(drExpireTimes))
+                if (!commState.putLongList(null, drExpireTimes))
                     return false;
 
                 commState.idx++;
 
             case 4:
-                if (!commState.putLongList(drTtls))
+                if (!commState.putLongList(null, drTtls))
                     return false;
 
                 commState.idx++;
@@ -567,7 +567,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im
             case 5:
                 if (drVers != null) {
                     if (commState.it == null) {
-                        if (!commState.putInt(drVers.size()))
+                        if (!commState.putInt(null, drVers.size()))
                             return false;
 
                         commState.it = drVers.iterator();
@@ -577,7 +577,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im
                         if (commState.cur == NULL)
                             commState.cur = commState.it.next();
 
-                        if (!commState.putCacheVersion((GridCacheVersion)commState.cur))
+                        if (!commState.putCacheVersion(null, (GridCacheVersion)commState.cur))
                             return false;
 
                         commState.cur = NULL;
@@ -585,14 +585,14 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im
 
                     commState.it = null;
                 } else {
-                    if (!commState.putInt(-1))
+                    if (!commState.putInt(null, -1))
                         return false;
                 }
 
                 commState.idx++;
 
             case 6:
-                if (!commState.putBoolean(fastMap))
+                if (!commState.putBoolean(null, fastMap))
                     return false;
 
                 commState.idx++;
@@ -600,7 +600,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im
             case 7:
                 if (filterBytes != null) {
                     if (commState.it == null) {
-                        if (!commState.putInt(filterBytes.length))
+                        if (!commState.putInt(null, filterBytes.length))
                             return false;
 
                         commState.it = arrayIterator(filterBytes);
@@ -610,7 +610,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im
                         if (commState.cur == NULL)
                             commState.cur = commState.it.next();
 
-                        if (!commState.putByteArray((byte[])commState.cur))
+                        if (!commState.putByteArray(null, (byte[])commState.cur))
                             return false;
 
                         commState.cur = NULL;
@@ -618,20 +618,20 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im
 
                     commState.it = null;
                 } else {
-                    if (!commState.putInt(-1))
+                    if (!commState.putInt(null, -1))
                         return false;
                 }
 
                 commState.idx++;
 
             case 8:
-                if (!commState.putCacheVersion(futVer))
+                if (!commState.putCacheVersion(null, futVer))
                     return false;
 
                 commState.idx++;
 
             case 9:
-                if (!commState.putBoolean(hasPrimary))
+                if (!commState.putBoolean(null, hasPrimary))
                     return false;
 
                 commState.idx++;
@@ -639,7 +639,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im
             case 10:
                 if (keyBytes != null) {
                     if (commState.it == null) {
-                        if (!commState.putInt(keyBytes.size()))
+                        if (!commState.putInt(null, keyBytes.size()))
                             return false;
 
                         commState.it = keyBytes.iterator();
@@ -649,7 +649,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im
                         if (commState.cur == NULL)
                             commState.cur = commState.it.next();
 
-                        if (!commState.putByteArray((byte[])commState.cur))
+                        if (!commState.putByteArray(null, (byte[])commState.cur))
                             return false;
 
                         commState.cur = NULL;
@@ -657,44 +657,44 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im
 
                     commState.it = null;
                 } else {
-                    if (!commState.putInt(-1))
+                    if (!commState.putInt(null, -1))
                         return false;
                 }
 
                 commState.idx++;
 
             case 11:
-                if (!commState.putEnum(op))
+                if (!commState.putEnum(null, op))
                     return false;
 
                 commState.idx++;
 
             case 12:
-                if (!commState.putBoolean(retval))
+                if (!commState.putBoolean(null, retval))
                     return false;
 
                 commState.idx++;
 
             case 13:
-                if (!commState.putEnum(syncMode))
+                if (!commState.putEnum(null, syncMode))
                     return false;
 
                 commState.idx++;
 
             case 14:
-                if (!commState.putLong(topVer))
+                if (!commState.putLong(null, topVer))
                     return false;
 
                 commState.idx++;
 
             case 15:
-                if (!commState.putLong(ttl))
+                if (!commState.putLong(null, ttl))
                     return false;
 
                 commState.idx++;
 
             case 16:
-                if (!commState.putCacheVersion(updateVer))
+                if (!commState.putCacheVersion(null, updateVer))
                     return false;
 
                 commState.idx++;
@@ -702,7 +702,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im
             case 17:
                 if (valBytes != null) {
                     if (commState.it == null) {
-                        if (!commState.putInt(valBytes.size()))
+                        if (!commState.putInt(null, valBytes.size()))
                             return false;
 
                         commState.it = valBytes.iterator();
@@ -712,7 +712,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im
                         if (commState.cur == NULL)
                             commState.cur = commState.it.next();
 
-                        if (!commState.putValueBytes((GridCacheValueBytes)commState.cur))
+                        if (!commState.putValueBytes(null, (GridCacheValueBytes)commState.cur))
                             return false;
 
                         commState.cur = NULL;
@@ -720,26 +720,26 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im
 
                     commState.it = null;
                 } else {
-                    if (!commState.putInt(-1))
+                    if (!commState.putInt(null, -1))
                         return false;
                 }
 
                 commState.idx++;
 
             case 18:
-                if (!commState.putBoolean(forceTransformBackups))
+                if (!commState.putBoolean(null, forceTransformBackups))
                     return false;
 
                 commState.idx++;
 
             case 19:
-                if (!commState.putUuid(subjId))
+                if (!commState.putUuid(null, subjId))
                     return false;
 
                 commState.idx++;
 
             case 20:
-                if (!commState.putInt(taskNameHash))
+                if (!commState.putInt(null, 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();
+                GridLongList drExpireTimes0 = commState.getLongList(null);
 
                 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();
+                GridLongList drTtls0 = commState.getLongList(null);
 
                 if (drTtls0 == LONG_LIST_NOT_READ)
                     return false;
@@ -783,7 +783,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im
                     if (buf.remaining() < 4)
                         return false;
 
-                    commState.readSize = commState.getInt();
+                    commState.readSize = commState.getInt(null);
                 }
 
                 if (commState.readSize >= 0) {
@@ -791,7 +791,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im
                         drVers = new ArrayList<>(commState.readSize);
 
                     for (int i = commState.readItems; i < commState.readSize; i++) {
-                        GridCacheVersion _val = commState.getCacheVersion();
+                        GridCacheVersion _val = commState.getCacheVersion(null);
 
                         if (_val == CACHE_VER_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();
+                fastMap = commState.getBoolean(null);
 
                 commState.idx++;
 
@@ -820,7 +820,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im
                     if (buf.remaining() < 4)
                         return false;
 
-                    commState.readSize = commState.getInt();
+                    commState.readSize = commState.getInt(null);
                 }
 
                 if (commState.readSize >= 0) {
@@ -828,7 +828,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im
                         filterBytes = new byte[commState.readSize][];
 
                     for (int i = commState.readItems; i < commState.readSize; i++) {
-                        byte[] _val = commState.getByteArray();
+                        byte[] _val = commState.getByteArray(null);
 
                         if (_val == BYTE_ARR_NOT_READ)
                             return false;
@@ -845,7 +845,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im
                 commState.idx++;
 
             case 8:
-                GridCacheVersion futVer0 = commState.getCacheVersion();
+                GridCacheVersion futVer0 = commState.getCacheVersion(null);
 
                 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();
+                hasPrimary = commState.getBoolean(null);
 
                 commState.idx++;
 
@@ -867,7 +867,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im
                     if (buf.remaining() < 4)
                         return false;
 
-                    commState.readSize = commState.getInt();
+                    commState.readSize = commState.getInt(null);
                 }
 
                 if (commState.readSize >= 0) {
@@ -875,7 +875,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im
                         keyBytes = new ArrayList<>(commState.readSize);
 
                     for (int i = commState.readItems; i < commState.readSize; i++) {
-                        byte[] _val = commState.getByteArray();
+                        byte[] _val = commState.getByteArray(null);
 
                         if (_val == BYTE_ARR_NOT_READ)
                             return false;
@@ -895,7 +895,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im
                 if (buf.remaining() < 1)
                     return false;
 
-                byte op0 = commState.getByte();
+                byte op0 = commState.getByte(null);
 
                 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();
+                retval = commState.getBoolean(null);
 
                 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();
+                byte syncMode0 = commState.getByte(null);
 
                 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();
+                topVer = commState.getLong(null);
 
                 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();
+                ttl = commState.getLong(null);
 
                 commState.idx++;
 
             case 16:
-                GridCacheVersion updateVer0 = commState.getCacheVersion();
+                GridCacheVersion updateVer0 = commState.getCacheVersion(null);
 
                 if (updateVer0 == CACHE_VER_NOT_READ)
                     return false;
@@ -950,7 +950,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im
                     if (buf.remaining() < 4)
                         return false;
 
-                    commState.readSize = commState.getInt();
+                    commState.readSize = commState.getInt(null);
                 }
 
                 if (commState.readSize >= 0) {
@@ -958,7 +958,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im
                         valBytes = new ArrayList<>(commState.readSize);
 
                     for (int i = commState.readItems; i < commState.readSize; i++) {
-                        GridCacheValueBytes _val = commState.getValueBytes();
+                        GridCacheValueBytes _val = commState.getValueBytes(null);
 
                         if (_val == VAL_BYTES_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();
+                forceTransformBackups = commState.getBoolean(null);
 
                 commState.idx++;
 
             case 19:
-                UUID subjId0 = commState.getUuid();
+                UUID subjId0 = commState.getUuid(null);
 
                 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();
+                taskNameHash = commState.getInt(null);
 
                 commState.idx++;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d21e6b4b/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 fe16214..ba683c3 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
@@ -396,7 +396,7 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i
             return false;
 
         if (!commState.typeWritten) {
-            if (!commState.putByte(directType()))
+            if (!commState.putByte(null, directType()))
                 return false;
 
             commState.typeWritten = true;
@@ -404,31 +404,31 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i
 
         switch (commState.idx) {
             case 3:
-                if (!commState.putByteArray(errBytes))
+                if (!commState.putByteArray(null, errBytes))
                     return false;
 
                 commState.idx++;
 
             case 4:
-                if (!commState.putByteArray(failedKeysBytes))
+                if (!commState.putByteArray(null, failedKeysBytes))
                     return false;
 
                 commState.idx++;
 
             case 5:
-                if (!commState.putCacheVersion(futVer))
+                if (!commState.putCacheVersion(null, futVer))
                     return false;
 
                 commState.idx++;
 
             case 6:
-                if (!commState.putByteArray(remapKeysBytes))
+                if (!commState.putByteArray(null, remapKeysBytes))
                     return false;
 
                 commState.idx++;
 
             case 7:
-                if (!commState.putByteArray(retValBytes))
+                if (!commState.putByteArray(null, retValBytes))
                     return false;
 
                 commState.idx++;
@@ -436,7 +436,7 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i
             case 8:
                 if (nearSkipIdxs != null) {
                     if (commState.it == null) {
-                        if (!commState.putInt(nearSkipIdxs.size()))
+                        if (!commState.putInt(null, nearSkipIdxs.size()))
                             return false;
 
                         commState.it = nearSkipIdxs.iterator();
@@ -446,7 +446,7 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i
                         if (commState.cur == NULL)
                             commState.cur = commState.it.next();
 
-                        if (!commState.putInt((int)commState.cur))
+                        if (!commState.putInt(null, (int)commState.cur))
                             return false;
 
                         commState.cur = NULL;
@@ -454,14 +454,14 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i
 
                     commState.it = null;
                 } else {
-                    if (!commState.putInt(-1))
+                    if (!commState.putInt(null, -1))
                         return false;
                 }
 
                 commState.idx++;
 
             case 9:
-                if (!commState.putLong(nearTtl))
+                if (!commState.putLong(null, nearTtl))
                     return false;
 
                 commState.idx++;
@@ -469,7 +469,7 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i
             case 10:
                 if (nearValBytes != null) {
                     if (commState.it == null) {
-                        if (!commState.putInt(nearValBytes.size()))
+                        if (!commState.putInt(null, nearValBytes.size()))
                             return false;
 
                         commState.it = nearValBytes.iterator();
@@ -479,7 +479,7 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i
                         if (commState.cur == NULL)
                             commState.cur = commState.it.next();
 
-                        if (!commState.putValueBytes((GridCacheValueBytes)commState.cur))
+                        if (!commState.putValueBytes(null, (GridCacheValueBytes)commState.cur))
                             return false;
 
                         commState.cur = NULL;
@@ -487,7 +487,7 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i
 
                     commState.it = null;
                 } else {
-                    if (!commState.putInt(-1))
+                    if (!commState.putInt(null, -1))
                         return false;
                 }
 
@@ -496,7 +496,7 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i
             case 11:
                 if (nearValsIdxs != null) {
                     if (commState.it == null) {
-                        if (!commState.putInt(nearValsIdxs.size()))
+                        if (!commState.putInt(null, nearValsIdxs.size()))
                             return false;
 
                         commState.it = nearValsIdxs.iterator();
@@ -506,7 +506,7 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i
                         if (commState.cur == NULL)
                             commState.cur = commState.it.next();
 
-                        if (!commState.putInt((int)commState.cur))
+                        if (!commState.putInt(null, (int)commState.cur))
                             return false;
 
                         commState.cur = NULL;
@@ -514,14 +514,14 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i
 
                     commState.it = null;
                 } else {
-                    if (!commState.putInt(-1))
+                    if (!commState.putInt(null, -1))
                         return false;
                 }
 
                 commState.idx++;
 
             case 12:
-                if (!commState.putCacheVersion(nearVer))
+                if (!commState.putCacheVersion(null, 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();
+                byte[] errBytes0 = commState.getByteArray(null);
 
                 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();
+                byte[] failedKeysBytes0 = commState.getByteArray(null);
 
                 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();
+                GridCacheVersion futVer0 = commState.getCacheVersion(null);
 
                 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();
+                byte[] remapKeysBytes0 = commState.getByteArray(null);
 
                 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();
+                byte[] retValBytes0 = commState.getByteArray(null);
 
                 if (retValBytes0 == BYTE_ARR_NOT_READ)
                     return false;
@@ -595,7 +595,7 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i
                     if (buf.remaining() < 4)
                         return false;
 
-                    commState.readSize = commState.getInt();
+                    commState.readSize = commState.getInt(null);
                 }
 
                 if (commState.readSize >= 0) {
@@ -606,7 +606,7 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i
                         if (buf.remaining() < 4)
                             return false;
 
-                        int _val = commState.getInt();
+                        int _val = commState.getInt(null);
 
                         nearSkipIdxs.add((Integer)_val);
 
@@ -623,7 +623,7 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i
                 if (buf.remaining() < 8)
                     return false;
 
-                nearTtl = commState.getLong();
+                nearTtl = commState.getLong(null);
 
                 commState.idx++;
 
@@ -632,7 +632,7 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i
                     if (buf.remaining() < 4)
                         return false;
 
-                    commState.readSize = commState.getInt();
+                    commState.readSize = commState.getInt(null);
                 }
 
                 if (commState.readSize >= 0) {
@@ -640,7 +640,7 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i
                         nearValBytes = new ArrayList<>(commState.readSize);
 
                     for (int i = commState.readItems; i < commState.readSize; i++) {
-                        GridCacheValueBytes _val = commState.getValueBytes();
+                        GridCacheValueBytes _val = commState.getValueBytes(null);
 
                         if (_val == VAL_BYTES_NOT_READ)
                             return false;
@@ -661,7 +661,7 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i
                     if (buf.remaining() < 4)
                         return false;
 
-                    commState.readSize = commState.getInt();
+                    commState.readSize = commState.getInt(null);
                 }
 
                 if (commState.readSize >= 0) {
@@ -672,7 +672,7 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i
                         if (buf.remaining() < 4)
                             return false;
 
-                        int _val = commState.getInt();
+                        int _val = commState.getInt(null);
 
                         nearValsIdxs.add((Integer)_val);
 
@@ -686,7 +686,7 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i
                 commState.idx++;
 
             case 12:
-                GridCacheVersion nearVer0 = commState.getCacheVersion();
+                GridCacheVersion nearVer0 = commState.getCacheVersion(null);
 
                 if (nearVer0 == CACHE_VER_NOT_READ)
                     return false;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d21e6b4b/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 3bd7d5e..30c18cc 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
@@ -185,7 +185,7 @@ public class GridDhtForceKeysRequest<K, V> extends GridCacheMessage<K, V> implem
             return false;
 
         if (!commState.typeWritten) {
-            if (!commState.putByte(directType()))
+            if (!commState.putByte(null, directType()))
                 return false;
 
             commState.typeWritten = true;
@@ -193,7 +193,7 @@ public class GridDhtForceKeysRequest<K, V> extends GridCacheMessage<K, V> implem
 
         switch (commState.idx) {
             case 3:
-                if (!commState.putGridUuid(futId))
+                if (!commState.putGridUuid(null, futId))
                     return false;
 
                 commState.idx++;
@@ -201,7 +201,7 @@ public class GridDhtForceKeysRequest<K, V> extends GridCacheMessage<K, V> implem
             case 4:
                 if (keyBytes != null) {
                     if (commState.it == null) {
-                        if (!commState.putInt(keyBytes.size()))
+                        if (!commState.putInt(null, keyBytes.size()))
                             return false;
 
                         commState.it = keyBytes.iterator();
@@ -211,7 +211,7 @@ public class GridDhtForceKeysRequest<K, V> extends GridCacheMessage<K, V> implem
                         if (commState.cur == NULL)
                             commState.cur = commState.it.next();
 
-                        if (!commState.putByteArray((byte[])commState.cur))
+                        if (!commState.putByteArray(null, (byte[])commState.cur))
                             return false;
 
                         commState.cur = NULL;
@@ -219,20 +219,20 @@ public class GridDhtForceKeysRequest<K, V> extends GridCacheMessage<K, V> implem
 
                     commState.it = null;
                 } else {
-                    if (!commState.putInt(-1))
+                    if (!commState.putInt(null, -1))
                         return false;
                 }
 
                 commState.idx++;
 
             case 5:
-                if (!commState.putGridUuid(miniId))
+                if (!commState.putGridUuid(null, miniId))
                     return false;
 
                 commState.idx++;
 
             case 6:
-                if (!commState.putLong(topVer))
+                if (!commState.putLong(null, 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();
+                IgniteUuid futId0 = commState.getGridUuid(null);
 
                 if (futId0 == GRID_UUID_NOT_READ)
                     return false;
@@ -266,7 +266,7 @@ public class GridDhtForceKeysRequest<K, V> extends GridCacheMessage<K, V> implem
                     if (buf.remaining() < 4)
                         return false;
 
-                    commState.readSize = commState.getInt();
+                    commState.readSize = commState.getInt(null);
                 }
 
                 if (commState.readSize >= 0) {
@@ -274,7 +274,7 @@ public class GridDhtForceKeysRequest<K, V> extends GridCacheMessage<K, V> implem
                         keyBytes = new ArrayList<>(commState.readSize);
 
                     for (int i = commState.readItems; i < commState.readSize; i++) {
-                        byte[] _val = commState.getByteArray();
+                        byte[] _val = commState.getByteArray(null);
 
                         if (_val == BYTE_ARR_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();
+                IgniteUuid miniId0 = commState.getGridUuid(null);
 
                 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();
+                topVer = commState.getLong(null);
 
                 commState.idx++;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d21e6b4b/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 df1afec..e333a95 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
@@ -189,7 +189,7 @@ public class GridDhtForceKeysResponse<K, V> extends GridCacheMessage<K, V> imple
             return false;
 
         if (!commState.typeWritten) {
-            if (!commState.putByte(directType()))
+            if (!commState.putByte(null, directType()))
                 return false;
 
             commState.typeWritten = true;
@@ -197,19 +197,19 @@ public class GridDhtForceKeysResponse<K, V> extends GridCacheMessage<K, V> imple
 
         switch (commState.idx) {
             case 3:
-                if (!commState.putGridUuid(futId))
+                if (!commState.putGridUuid(null, futId))
                     return false;
 
                 commState.idx++;
 
             case 4:
-                if (!commState.putByteArray(infosBytes))
+                if (!commState.putByteArray(null, infosBytes))
                     return false;
 
                 commState.idx++;
 
             case 5:
-                if (!commState.putGridUuid(miniId))
+                if (!commState.putGridUuid(null, miniId))
                     return false;
 
                 commState.idx++;
@@ -217,7 +217,7 @@ public class GridDhtForceKeysResponse<K, V> extends GridCacheMessage<K, V> imple
             case 6:
                 if (missedKeyBytes != null) {
                     if (commState.it == null) {
-                        if (!commState.putInt(missedKeyBytes.size()))
+                        if (!commState.putInt(null, missedKeyBytes.size()))
                             return false;
 
                         commState.it = missedKeyBytes.iterator();
@@ -227,7 +227,7 @@ public class GridDhtForceKeysResponse<K, V> extends GridCacheMessage<K, V> imple
                         if (commState.cur == NULL)
                             commState.cur = commState.it.next();
 
-                        if (!commState.putByteArray((byte[])commState.cur))
+                        if (!commState.putByteArray(null, (byte[])commState.cur))
                             return false;
 
                         commState.cur = NULL;
@@ -235,7 +235,7 @@ public class GridDhtForceKeysResponse<K, V> extends GridCacheMessage<K, V> imple
 
                     commState.it = null;
                 } else {
-                    if (!commState.putInt(-1))
+                    if (!commState.putInt(null, -1))
                         return false;
                 }
 
@@ -256,7 +256,7 @@ public class GridDhtForceKeysResponse<K, V> extends GridCacheMessage<K, V> imple
 
         switch (commState.idx) {
             case 3:
-                IgniteUuid futId0 = commState.getGridUuid();
+                IgniteUuid futId0 = commState.getGridUuid(null);
 
                 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();
+                byte[] infosBytes0 = commState.getByteArray(null);
 
                 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();
+                IgniteUuid miniId0 = commState.getGridUuid(null);
 
                 if (miniId0 == GRID_UUID_NOT_READ)
                     return false;
@@ -290,7 +290,7 @@ public class GridDhtForceKeysResponse<K, V> extends GridCacheMessage<K, V> imple
                     if (buf.remaining() < 4)
                         return false;
 
-                    commState.readSize = commState.getInt();
+                    commState.readSize = commState.getInt(null);
                 }
 
                 if (commState.readSize >= 0) {
@@ -298,7 +298,7 @@ public class GridDhtForceKeysResponse<K, V> extends GridCacheMessage<K, V> imple
                         missedKeyBytes = new ArrayList<>(commState.readSize);
 
                     for (int i = commState.readItems; i < commState.readSize; i++) {
-                        byte[] _val = commState.getByteArray();
+                        byte[] _val = commState.getByteArray(null);
 
                         if (_val == BYTE_ARR_NOT_READ)
                             return false;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d21e6b4b/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 01ceb9d..f77adc5 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
@@ -215,7 +215,7 @@ public class GridDhtPartitionDemandMessage<K, V> extends GridCacheMessage<K, V>
             return false;
 
         if (!commState.typeWritten) {
-            if (!commState.putByte(directType()))
+            if (!commState.putByte(null, directType()))
                 return false;
 
             commState.typeWritten = true;
@@ -225,7 +225,7 @@ public class GridDhtPartitionDemandMessage<K, V> extends GridCacheMessage<K, V>
             case 3:
                 if (parts != null) {
                     if (commState.it == null) {
-                        if (!commState.putInt(parts.size()))
+                        if (!commState.putInt(null, parts.size()))
                             return false;
 
                         commState.it = parts.iterator();
@@ -235,7 +235,7 @@ public class GridDhtPartitionDemandMessage<K, V> extends GridCacheMessage<K, V>
                         if (commState.cur == NULL)
                             commState.cur = commState.it.next();
 
-                        if (!commState.putInt((int)commState.cur))
+                        if (!commState.putInt(null, (int)commState.cur))
                             return false;
 
                         commState.cur = NULL;
@@ -243,38 +243,38 @@ public class GridDhtPartitionDemandMessage<K, V> extends GridCacheMessage<K, V>
 
                     commState.it = null;
                 } else {
-                    if (!commState.putInt(-1))
+                    if (!commState.putInt(null, -1))
                         return false;
                 }
 
                 commState.idx++;
 
             case 4:
-                if (!commState.putLong(timeout))
+                if (!commState.putLong(null, timeout))
                     return false;
 
                 commState.idx++;
 
             case 5:
-                if (!commState.putLong(topVer))
+                if (!commState.putLong(null, topVer))
                     return false;
 
                 commState.idx++;
 
             case 6:
-                if (!commState.putByteArray(topicBytes))
+                if (!commState.putByteArray(null, topicBytes))
                     return false;
 
                 commState.idx++;
 
             case 7:
-                if (!commState.putLong(updateSeq))
+                if (!commState.putLong(null, updateSeq))
                     return false;
 
                 commState.idx++;
 
             case 8:
-                if (!commState.putInt(workerId))
+                if (!commState.putInt(null, workerId))
                     return false;
 
                 commState.idx++;
@@ -298,7 +298,7 @@ public class GridDhtPartitionDemandMessage<K, V> extends GridCacheMessage<K, V>
                     if (buf.remaining() < 4)
                         return false;
 
-                    commState.readSize = commState.getInt();
+                    commState.readSize = commState.getInt(null);
                 }
 
                 if (commState.readSize >= 0) {
@@ -309,7 +309,7 @@ public class GridDhtPartitionDemandMessage<K, V> extends GridCacheMessage<K, V>
                         if (buf.remaining() < 4)
                             return false;
 
-                        int _val = commState.getInt();
+                        int _val = commState.getInt(null);
 
                         parts.add((Integer)_val);
 
@@ -326,7 +326,7 @@ public class GridDhtPartitionDemandMessage<K, V> extends GridCacheMessage<K, V>
                 if (buf.remaining() < 8)
                     return false;
 
-                timeout = commState.getLong();
+                timeout = commState.getLong(null);
 
                 commState.idx++;
 
@@ -334,12 +334,12 @@ public class GridDhtPartitionDemandMessage<K, V> extends GridCacheMessage<K, V>
                 if (buf.remaining() < 8)
                     return false;
 
-                topVer = commState.getLong();
+                topVer = commState.getLong(null);
 
                 commState.idx++;
 
             case 6:
-                byte[] topicBytes0 = commState.getByteArray();
+                byte[] topicBytes0 = commState.getByteArray(null);
 
                 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();
+                updateSeq = commState.getLong(null);
 
                 commState.idx++;
 
@@ -360,7 +360,7 @@ public class GridDhtPartitionDemandMessage<K, V> extends GridCacheMessage<K, V>
                 if (buf.remaining() < 4)
                     return false;
 
-                workerId = commState.getInt();
+                workerId = commState.getInt(null);
 
                 commState.idx++;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d21e6b4b/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 57c8e52..bf3b606 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
@@ -300,7 +300,7 @@ public class GridDhtPartitionSupplyMessage<K, V> extends GridCacheMessage<K, V>
             return false;
 
         if (!commState.typeWritten) {
-            if (!commState.putByte(directType()))
+            if (!commState.putByte(null, directType()))
                 return false;
 
             commState.typeWritten = true;
@@ -308,13 +308,13 @@ public class GridDhtPartitionSupplyMessage<K, V> extends GridCacheMessage<K, V>
 
         switch (commState.idx) {
             case 3:
-                if (!commState.putBoolean(ack))
+                if (!commState.putBoolean(null, ack))
                     return false;
 
                 commState.idx++;
 
             case 4:
-                if (!commState.putByteArray(infoBytes))
+                if (!commState.putByteArray(null, infoBytes))
                     return false;
 
                 commState.idx++;
@@ -322,7 +322,7 @@ public class GridDhtPartitionSupplyMessage<K, V> extends GridCacheMessage<K, V>
             case 5:
                 if (last != null) {
                     if (commState.it == null) {
-                        if (!commState.putInt(last.size()))
+                        if (!commState.putInt(null, last.size()))
                             return false;
 
                         commState.it = last.iterator();
@@ -332,7 +332,7 @@ public class GridDhtPartitionSupplyMessage<K, V> extends GridCacheMessage<K, V>
                         if (commState.cur == NULL)
                             commState.cur = commState.it.next();
 
-                        if (!commState.putInt((int)commState.cur))
+                        if (!commState.putInt(null, (int)commState.cur))
                             return false;
 
                         commState.cur = NULL;
@@ -340,7 +340,7 @@ public class GridDhtPartitionSupplyMessage<K, V> extends GridCacheMessage<K, V>
 
                     commState.it = null;
                 } else {
-                    if (!commState.putInt(-1))
+                    if (!commState.putInt(null, -1))
                         return false;
                 }
 
@@ -349,7 +349,7 @@ public class GridDhtPartitionSupplyMessage<K, V> extends GridCacheMessage<K, V>
             case 6:
                 if (missed != null) {
                     if (commState.it == null) {
-                        if (!commState.putInt(missed.size()))
+                        if (!commState.putInt(null, missed.size()))
                             return false;
 
                         commState.it = missed.iterator();
@@ -359,7 +359,7 @@ public class GridDhtPartitionSupplyMessage<K, V> extends GridCacheMessage<K, V>
                         if (commState.cur == NULL)
                             commState.cur = commState.it.next();
 
-                        if (!commState.putInt((int)commState.cur))
+                        if (!commState.putInt(null, (int)commState.cur))
                             return false;
 
                         commState.cur = NULL;
@@ -367,20 +367,20 @@ public class GridDhtPartitionSupplyMessage<K, V> extends GridCacheMessage<K, V>
 
                     commState.it = null;
                 } else {
-                    if (!commState.putInt(-1))
+                    if (!commState.putInt(null, -1))
                         return false;
                 }
 
                 commState.idx++;
 
             case 7:
-                if (!commState.putLong(updateSeq))
+                if (!commState.putLong(null, updateSeq))
                     return false;
 
                 commState.idx++;
 
             case 8:
-                if (!commState.putInt(workerId))
+                if (!commState.putInt(null, 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();
+                ack = commState.getBoolean(null);
 
                 commState.idx++;
 
             case 4:
-                byte[] infoBytes0 = commState.getByteArray();
+                byte[] infoBytes0 = commState.getByteArray(null);
 
                 if (infoBytes0 == BYTE_ARR_NOT_READ)
                     return false;
@@ -422,7 +422,7 @@ public class GridDhtPartitionSupplyMessage<K, V> extends GridCacheMessage<K, V>
                     if (buf.remaining() < 4)
                         return false;
 
-                    commState.readSize = commState.getInt();
+                    commState.readSize = commState.getInt(null);
                 }
 
                 if (commState.readSize >= 0) {
@@ -433,7 +433,7 @@ public class GridDhtPartitionSupplyMessage<K, V> extends GridCacheMessage<K, V>
                         if (buf.remaining() < 4)
                             return false;
 
-                        int _val = commState.getInt();
+                        int _val = commState.getInt(null);
 
                         last.add((Integer)_val);
 
@@ -451,7 +451,7 @@ public class GridDhtPartitionSupplyMessage<K, V> extends GridCacheMessage<K, V>
                     if (buf.remaining() < 4)
                         return false;
 
-                    commState.readSize = commState.getInt();
+                    commState.readSize = commState.getInt(null);
                 }
 
                 if (commState.readSize >= 0) {
@@ -462,7 +462,7 @@ public class GridDhtPartitionSupplyMessage<K, V> extends GridCacheMessage<K, V>
                         if (buf.remaining() < 4)
                             return false;
 
-                        int _val = commState.getInt();
+                        int _val = commState.getInt(null);
 
                         missed.add((Integer)_val);
 
@@ -479,7 +479,7 @@ public class GridDhtPartitionSupplyMessage<K, V> extends GridCacheMessage<K, V>
                 if (buf.remaining() < 8)
                     return false;
 
-                updateSeq = commState.getLong();
+                updateSeq = commState.getLong(null);
 
                 commState.idx++;
 
@@ -487,7 +487,7 @@ public class GridDhtPartitionSupplyMessage<K, V> extends GridCacheMessage<K, V>
                 if (buf.remaining() < 4)
                     return false;
 
-                workerId = commState.getInt();
+                workerId = commState.getInt(null);
 
                 commState.idx++;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d21e6b4b/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 28cb6bb..e275f17 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
@@ -84,7 +84,7 @@ abstract class GridDhtPartitionsAbstractMessage<K, V> extends GridCacheMessage<K
             return false;
 
         if (!commState.typeWritten) {
-            if (!commState.putByte(directType()))
+            if (!commState.putByte(null, directType()))
                 return false;
 
             commState.typeWritten = true;
@@ -92,13 +92,13 @@ abstract class GridDhtPartitionsAbstractMessage<K, V> extends GridCacheMessage<K
 
         switch (commState.idx) {
             case 3:
-                if (!commState.putDhtPartitionExchangeId(exchId))
+                if (!commState.putDhtPartitionExchangeId(null, exchId))
                     return false;
 
                 commState.idx++;
 
             case 4:
-                if (!commState.putCacheVersion(lastVer))
+                if (!commState.putCacheVersion(null, 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();
+                GridDhtPartitionExchangeId exchId0 = commState.getDhtPartitionExchangeId(null);
 
                 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();
+                GridCacheVersion lastVer0 = commState.getCacheVersion(null);
 
                 if (lastVer0 == CACHE_VER_NOT_READ)
                     return false;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d21e6b4b/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 68ff1a4..d4d4570 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
@@ -165,7 +165,7 @@ public class GridDhtPartitionsFullMessage<K, V> extends GridDhtPartitionsAbstrac
             return false;
 
         if (!commState.typeWritten) {
-            if (!commState.putByte(directType()))
+            if (!commState.putByte(null, directType()))
                 return false;
 
             commState.typeWritten = true;
@@ -173,19 +173,19 @@ public class GridDhtPartitionsFullMessage<K, V> extends GridDhtPartitionsAbstrac
 
         switch (commState.idx) {
             case 5:
-                if (!commState.putByteArray(affAssignmentBytes))
+                if (!commState.putByteArray(null, affAssignmentBytes))
                     return false;
 
                 commState.idx++;
 
             case 6:
-                if (!commState.putByteArray(partsBytes))
+                if (!commState.putByteArray(null, partsBytes))
                     return false;
 
                 commState.idx++;
 
             case 7:
-                if (!commState.putLong(topVer))
+                if (!commState.putLong(null, 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();
+                byte[] affAssignmentBytes0 = commState.getByteArray(null);
 
                 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();
+                byte[] partsBytes0 = commState.getByteArray(null);
 
                 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();
+                topVer = commState.getLong(null);
 
                 commState.idx++;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d21e6b4b/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 350da08..0671800 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
@@ -114,7 +114,7 @@ public class GridDhtPartitionsSingleMessage<K, V> extends GridDhtPartitionsAbstr
             return false;
 
         if (!commState.typeWritten) {
-            if (!commState.putByte(directType()))
+            if (!commState.putByte(null, directType()))
                 return false;
 
             commState.typeWritten = true;
@@ -122,7 +122,7 @@ public class GridDhtPartitionsSingleMessage<K, V> extends GridDhtPartitionsAbstr
 
         switch (commState.idx) {
             case 5:
-                if (!commState.putByteArray(partsBytes))
+                if (!commState.putByteArray(null, 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();
+                byte[] partsBytes0 = commState.getByteArray(null);
 
                 if (partsBytes0 == BYTE_ARR_NOT_READ)
                     return false;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d21e6b4b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleRequest.java
index 2015225..853cc51 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleRequest.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleRequest.java
@@ -61,7 +61,7 @@ public class GridDhtPartitionsSingleRequest<K, V> extends GridDhtPartitionsAbstr
             return false;
 
         if (!commState.typeWritten) {
-            if (!commState.putByte(directType()))
+            if (!commState.putByte(null, directType()))
                 return false;
 
             commState.typeWritten = true;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d21e6b4b/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 12aacb7..61815b0 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
@@ -250,7 +250,7 @@ public class GridNearGetRequest<K, V> extends GridCacheMessage<K, V> implements
             return false;
 
         if (!commState.typeWritten) {
-            if (!commState.putByte(directType()))
+            if (!commState.putByte(null, directType()))
                 return false;
 
             commState.typeWritten = true;
@@ -260,7 +260,7 @@ public class GridNearGetRequest<K, V> extends GridCacheMessage<K, V> implements
             case 3:
                 if (filterBytes != null) {
                     if (commState.it == null) {
-                        if (!commState.putInt(filterBytes.length))
+                        if (!commState.putInt(null, filterBytes.length))
                             return false;
 
                         commState.it = arrayIterator(filterBytes);
@@ -270,7 +270,7 @@ public class GridNearGetRequest<K, V> extends GridCacheMessage<K, V> implements
                         if (commState.cur == NULL)
                             commState.cur = commState.it.next();
 
-                        if (!commState.putByteArray((byte[])commState.cur))
+                        if (!commState.putByteArray(null, (byte[])commState.cur))
                             return false;
 
                         commState.cur = NULL;
@@ -278,14 +278,14 @@ public class GridNearGetRequest<K, V> extends GridCacheMessage<K, V> implements
 
                     commState.it = null;
                 } else {
-                    if (!commState.putInt(-1))
+                    if (!commState.putInt(null, -1))
                         return false;
                 }
 
                 commState.idx++;
 
             case 4:
-                if (!commState.putGridUuid(futId))
+                if (!commState.putGridUuid(null, futId))
                     return false;
 
                 commState.idx++;
@@ -293,7 +293,7 @@ public class GridNearGetRequest<K, V> extends GridCacheMessage<K, V> implements
             case 5:
                 if (keyBytes != null) {
                     if (commState.it == null) {
-                        if (!commState.putInt(keyBytes.size()))
+                        if (!commState.putInt(null, keyBytes.size()))
                             return false;
 
                         commState.it = keyBytes.entrySet().iterator();
@@ -306,13 +306,13 @@ public class GridNearGetRequest<K, V> extends GridCacheMessage<K, V> implements
                         Map.Entry<byte[], Boolean> e = (Map.Entry<byte[], Boolean>)commState.cur;
 
                         if (!commState.keyDone) {
-                            if (!commState.putByteArray(e.getKey()))
+                            if (!commState.putByteArray(null, e.getKey()))
                                 return false;
 
                             commState.keyDone = true;
                         }
 
-                        if (!commState.putBoolean(e.getValue()))
+                        if (!commState.putBoolean(null, e.getValue()))
                             return false;
 
                         commState.keyDone = false;
@@ -322,44 +322,44 @@ public class GridNearGetRequest<K, V> extends GridCacheMessage<K, V> implements
 
                     commState.it = null;
                 } else {
-                    if (!commState.putInt(-1))
+                    if (!commState.putInt(null, -1))
                         return false;
                 }
 
                 commState.idx++;
 
             case 6:
-                if (!commState.putGridUuid(miniId))
+                if (!commState.putGridUuid(null, miniId))
                     return false;
 
                 commState.idx++;
 
             case 7:
-                if (!commState.putBoolean(reload))
+                if (!commState.putBoolean(null, reload))
                     return false;
 
                 commState.idx++;
 
             case 8:
-                if (!commState.putLong(topVer))
+                if (!commState.putLong(null, topVer))
                     return false;
 
                 commState.idx++;
 
             case 9:
-                if (!commState.putCacheVersion(ver))
+                if (!commState.putCacheVersion(null, ver))
                     return false;
 
                 commState.idx++;
 
             case 10:
-                if (!commState.putUuid(subjId))
+                if (!commState.putUuid(null, subjId))
                     return false;
 
                 commState.idx++;
 
             case 11:
-                if (!commState.putInt(taskNameHash))
+                if (!commState.putInt(null, taskNameHash))
                     return false;
 
                 commState.idx++;
@@ -383,7 +383,7 @@ public class GridNearGetRequest<K, V> extends GridCacheMessage<K, V> implements
                     if (buf.remaining() < 4)
                         return false;
 
-                    commState.readSize = commState.getInt();
+                    commState.readSize = commState.getInt(null);
                 }
 
                 if (commState.readSize >= 0) {
@@ -391,7 +391,7 @@ public class GridNearGetRequest<K, V> extends GridCacheMessage<K, V> implements
                         filterBytes = new byte[commState.readSize][];
 
                     for (int i = commState.readItems; i < commState.readSize; i++) {
-                        byte[] _val = commState.getByteArray();
+                        byte[] _val = commState.getByteArray(null);
 
                         if (_val == BYTE_ARR_NOT_READ)
                             return false;
@@ -408,7 +408,7 @@ public class GridNearGetRequest<K, V> extends GridCacheMessage<K, V> implements
                 commState.idx++;
 
             case 4:
-                IgniteUuid futId0 = commState.getGridUuid();
+                IgniteUuid futId0 = commState.getGridUuid(null);
 
                 if (futId0 == GRID_UUID_NOT_READ)
                     return false;
@@ -422,7 +422,7 @@ public class GridNearGetRequest<K, V> extends GridCacheMessage<K, V> implements
                     if (buf.remaining() < 4)
                         return false;
 
-                    commState.readSize = commState.getInt();
+                    commState.readSize = commState.getInt(null);
                 }
 
                 if (commState.readSize >= 0) {
@@ -431,7 +431,7 @@ public class GridNearGetRequest<K, V> extends GridCacheMessage<K, V> implements
 
                     for (int i = commState.readItems; i < commState.readSize; i++) {
                         if (!commState.keyDone) {
-                            byte[] _val = commState.getByteArray();
+                            byte[] _val = commState.getByteArray(null);
 
                             if (_val == BYTE_ARR_NOT_READ)
                                 return false;
@@ -443,7 +443,7 @@ public class GridNearGetRequest<K, V> extends GridCacheMessage<K, V> implements
                         if (buf.remaining() < 1)
                             return false;
 
-                        boolean _val = commState.getBoolean();
+                        boolean _val = commState.getBoolean(null);
 
                         keyBytes.put((byte[])commState.cur, _val);
 
@@ -460,7 +460,7 @@ public class GridNearGetRequest<K, V> extends GridCacheMessage<K, V> implements
                 commState.idx++;
 
             case 6:
-                IgniteUuid miniId0 = commState.getGridUuid();
+                IgniteUuid miniId0 = commState.getGridUuid(null);
 
                 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();
+                reload = commState.getBoolean(null);
 
                 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();
+                topVer = commState.getLong(null);
 
                 commState.idx++;
 
             case 9:
-                GridCacheVersion ver0 = commState.getCacheVersion();
+                GridCacheVersion ver0 = commState.getCacheVersion(null);
 
                 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();
+                UUID subjId0 = commState.getUuid(null);
 
                 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();
+                taskNameHash = commState.getInt(null);
 
                 commState.idx++;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d21e6b4b/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 5d171bc..1eba548 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
@@ -226,7 +226,7 @@ public class GridNearGetResponse<K, V> extends GridCacheMessage<K, V> implements
             return false;
 
         if (!commState.typeWritten) {
-            if (!commState.putByte(directType()))
+            if (!commState.putByte(null, directType()))
                 return false;
 
             commState.typeWritten = true;
@@ -234,19 +234,19 @@ public class GridNearGetResponse<K, V> extends GridCacheMessage<K, V> implements
 
         switch (commState.idx) {
             case 3:
-                if (!commState.putByteArray(entriesBytes))
+                if (!commState.putByteArray(null, entriesBytes))
                     return false;
 
                 commState.idx++;
 
             case 4:
-                if (!commState.putByteArray(errBytes))
+                if (!commState.putByteArray(null, errBytes))
                     return false;
 
                 commState.idx++;
 
             case 5:
-                if (!commState.putGridUuid(futId))
+                if (!commState.putGridUuid(null, futId))
                     return false;
 
                 commState.idx++;
@@ -254,7 +254,7 @@ public class GridNearGetResponse<K, V> extends GridCacheMessage<K, V> implements
             case 6:
                 if (invalidParts != null) {
                     if (commState.it == null) {
-                        if (!commState.putInt(invalidParts.size()))
+                        if (!commState.putInt(null, invalidParts.size()))
                             return false;
 
                         commState.it = invalidParts.iterator();
@@ -264,7 +264,7 @@ public class GridNearGetResponse<K, V> extends GridCacheMessage<K, V> implements
                         if (commState.cur == NULL)
                             commState.cur = commState.it.next();
 
-                        if (!commState.putInt((int)commState.cur))
+                        if (!commState.putInt(null, (int)commState.cur))
                             return false;
 
                         commState.cur = NULL;
@@ -272,26 +272,26 @@ public class GridNearGetResponse<K, V> extends GridCacheMessage<K, V> implements
 
                     commState.it = null;
                 } else {
-                    if (!commState.putInt(-1))
+                    if (!commState.putInt(null, -1))
                         return false;
                 }
 
                 commState.idx++;
 
             case 7:
-                if (!commState.putGridUuid(miniId))
+                if (!commState.putGridUuid(null, miniId))
                     return false;
 
                 commState.idx++;
 
             case 8:
-                if (!commState.putLong(topVer))
+                if (!commState.putLong(null, topVer))
                     return false;
 
                 commState.idx++;
 
             case 9:
-                if (!commState.putCacheVersion(ver))
+                if (!commState.putCacheVersion(null, 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();
+                byte[] entriesBytes0 = commState.getByteArray(null);
 
                 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();
+                byte[] errBytes0 = commState.getByteArray(null);
 
                 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();
+                IgniteUuid futId0 = commState.getGridUuid(null);
 
                 if (futId0 == GRID_UUID_NOT_READ)
                     return false;
@@ -345,7 +345,7 @@ public class GridNearGetResponse<K, V> extends GridCacheMessage<K, V> implements
                     if (buf.remaining() < 4)
                         return false;
 
-                    commState.readSize = commState.getInt();
+                    commState.readSize = commState.getInt(null);
                 }
 
                 if (commState.readSize >= 0) {
@@ -356,7 +356,7 @@ public class GridNearGetResponse<K, V> extends GridCacheMessage<K, V> implements
                         if (buf.remaining() < 4)
                             return false;
 
-                        int _val = commState.getInt();
+                        int _val = commState.getInt(null);
 
                         invalidParts.add((Integer)_val);
 
@@ -370,7 +370,7 @@ public class GridNearGetResponse<K, V> extends GridCacheMessage<K, V> implements
                 commState.idx++;
 
             case 7:
-                IgniteUuid miniId0 = commState.getGridUuid();
+                IgniteUuid miniId0 = commState.getGridUuid(null);
 
                 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();
+                topVer = commState.getLong(null);
 
                 commState.idx++;
 
             case 9:
-                GridCacheVersion ver0 = commState.getCacheVersion();
+                GridCacheVersion ver0 = commState.getCacheVersion(null);
 
                 if (ver0 == CACHE_VER_NOT_READ)
                     return false;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d21e6b4b/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 d9217d5..6f80471 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
@@ -327,7 +327,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V>
             return false;
 
         if (!commState.typeWritten) {
-            if (!commState.putByte(directType()))
+            if (!commState.putByte(null, directType()))
                 return false;
 
             commState.typeWritten = true;
@@ -337,7 +337,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V>
             case 24:
                 if (dhtVers != null) {
                     if (commState.it == null) {
-                        if (!commState.putInt(dhtVers.length))
+                        if (!commState.putInt(null, dhtVers.length))
                             return false;
 
                         commState.it = arrayIterator(dhtVers);
@@ -347,7 +347,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V>
                         if (commState.cur == NULL)
                             commState.cur = commState.it.next();
 
-                        if (!commState.putCacheVersion((GridCacheVersion)commState.cur))
+                        if (!commState.putCacheVersion(null, (GridCacheVersion)commState.cur))
                             return false;
 
                         commState.cur = NULL;
@@ -355,7 +355,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V>
 
                     commState.it = null;
                 } else {
-                    if (!commState.putInt(-1))
+                    if (!commState.putInt(null, -1))
                         return false;
                 }
 
@@ -364,7 +364,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V>
             case 25:
                 if (filterBytes != null) {
                     if (commState.it == null) {
-                        if (!commState.putInt(filterBytes.length))
+                        if (!commState.putInt(null, filterBytes.length))
                             return false;
 
                         commState.it = arrayIterator(filterBytes);
@@ -374,7 +374,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V>
                         if (commState.cur == NULL)
                             commState.cur = commState.it.next();
 
-                        if (!commState.putByteArray((byte[])commState.cur))
+                        if (!commState.putByteArray(null, (byte[])commState.cur))
                             return false;
 
                         commState.cur = NULL;
@@ -382,56 +382,56 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V>
 
                     commState.it = null;
                 } else {
-                    if (!commState.putInt(-1))
+                    if (!commState.putInt(null, -1))
                         return false;
                 }
 
                 commState.idx++;
 
             case 26:
-                if (!commState.putBoolean(implicitSingleTx))
+                if (!commState.putBoolean(null, implicitSingleTx))
                     return false;
 
                 commState.idx++;
 
             case 27:
-                if (!commState.putBoolean(implicitTx))
+                if (!commState.putBoolean(null, implicitTx))
                     return false;
 
                 commState.idx++;
 
             case 28:
-                if (!commState.putGridUuid(miniId))
+                if (!commState.putGridUuid(null, miniId))
                     return false;
 
                 commState.idx++;
 
             case 29:
-                if (!commState.putBoolean(onePhaseCommit))
+                if (!commState.putBoolean(null, onePhaseCommit))
                     return false;
 
                 commState.idx++;
 
             case 30:
-                if (!commState.putLong(topVer))
+                if (!commState.putLong(null, topVer))
                     return false;
 
                 commState.idx++;
 
             case 31:
-                if (!commState.putUuid(subjId))
+                if (!commState.putUuid(null, subjId))
                     return false;
 
                 commState.idx++;
 
             case 32:
-                if (!commState.putInt(taskNameHash))
+                if (!commState.putInt(null, taskNameHash))
                     return false;
 
                 commState.idx++;
 
             case 33:
-                if (!commState.putBoolean(hasTransforms))
+                if (!commState.putBoolean(null, hasTransforms))
                     return false;
 
                 commState.idx++;
@@ -455,7 +455,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V>
                     if (buf.remaining() < 4)
                         return false;
 
-                    commState.readSize = commState.getInt();
+                    commState.readSize = commState.getInt(null);
                 }
 
                 if (commState.readSize >= 0) {
@@ -463,7 +463,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V>
                         dhtVers = new GridCacheVersion[commState.readSize];
 
                     for (int i = commState.readItems; i < commState.readSize; i++) {
-                        GridCacheVersion _val = commState.getCacheVersion();
+                        GridCacheVersion _val = commState.getCacheVersion(null);
 
                         if (_val == CACHE_VER_NOT_READ)
                             return false;
@@ -484,7 +484,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V>
                     if (buf.remaining() < 4)
                         return false;
 
-                    commState.readSize = commState.getInt();
+                    commState.readSize = commState.getInt(null);
                 }
 
                 if (commState.readSize >= 0) {
@@ -492,7 +492,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V>
                         filterBytes = new byte[commState.readSize][];
 
                     for (int i = commState.readItems; i < commState.readSize; i++) {
-                        byte[] _val = commState.getByteArray();
+                        byte[] _val = commState.getByteArray(null);
 
                         if (_val == BYTE_ARR_NOT_READ)
                             return false;
@@ -512,7 +512,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V>
                 if (buf.remaining() < 1)
                     return false;
 
-                implicitSingleTx = commState.getBoolean();
+                implicitSingleTx = commState.getBoolean(null);
 
                 commState.idx++;
 
@@ -520,12 +520,12 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V>
                 if (buf.remaining() < 1)
                     return false;
 
-                implicitTx = commState.getBoolean();
+                implicitTx = commState.getBoolean(null);
 
                 commState.idx++;
 
             case 28:
-                IgniteUuid miniId0 = commState.getGridUuid();
+                IgniteUuid miniId0 = commState.getGridUuid(null);
 
                 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();
+                onePhaseCommit = commState.getBoolean(null);
 
                 commState.idx++;
 
@@ -546,12 +546,12 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V>
                 if (buf.remaining() < 8)
                     return false;
 
-                topVer = commState.getLong();
+                topVer = commState.getLong(null);
 
                 commState.idx++;
 
             case 31:
-                UUID subjId0 = commState.getUuid();
+                UUID subjId0 = commState.getUuid(null);
 
                 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();
+                taskNameHash = commState.getInt(null);
 
                 commState.idx++;
 
@@ -572,7 +572,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V>
                 if (buf.remaining() < 1)
                     return false;
 
-                hasTransforms = commState.getBoolean();
+                hasTransforms = commState.getBoolean(null);
 
                 commState.idx++;
 


Mime
View raw message