ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vkuliche...@apache.org
Subject [06/20] incubator-ignite git commit: IGNITE-61 - Portable format in direct marshalling
Date Mon, 22 Dec 2014 23:40:00 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d21e6b4b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/eventstorage/GridEventStorageMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/eventstorage/GridEventStorageMessage.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/eventstorage/GridEventStorageMessage.java
index ae0436a..f80707a 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/eventstorage/GridEventStorageMessage.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/eventstorage/GridEventStorageMessage.java
@@ -286,7 +286,7 @@ public class GridEventStorageMessage extends GridTcpCommunicationMessageAdapter
         commState.setBuffer(buf);
 
         if (!commState.typeWritten) {
-            if (!commState.putByte(directType()))
+            if (!commState.putByte(null, directType()))
                 return false;
 
             commState.typeWritten = true;
@@ -294,37 +294,37 @@ public class GridEventStorageMessage extends GridTcpCommunicationMessageAdapter
 
         switch (commState.idx) {
             case 0:
-                if (!commState.putGridUuid(clsLdrId))
+                if (!commState.putGridUuid(null, clsLdrId))
                     return false;
 
                 commState.idx++;
 
             case 1:
-                if (!commState.putEnum(depMode))
+                if (!commState.putEnum(null, depMode))
                     return false;
 
                 commState.idx++;
 
             case 2:
-                if (!commState.putByteArray(evtsBytes))
+                if (!commState.putByteArray(null, evtsBytes))
                     return false;
 
                 commState.idx++;
 
             case 3:
-                if (!commState.putByteArray(exBytes))
+                if (!commState.putByteArray(null, exBytes))
                     return false;
 
                 commState.idx++;
 
             case 4:
-                if (!commState.putByteArray(filter))
+                if (!commState.putByteArray(null, filter))
                     return false;
 
                 commState.idx++;
 
             case 5:
-                if (!commState.putString(filterClsName))
+                if (!commState.putString(null, filterClsName))
                     return false;
 
                 commState.idx++;
@@ -332,7 +332,7 @@ public class GridEventStorageMessage extends GridTcpCommunicationMessageAdapter
             case 6:
                 if (ldrParties != null) {
                     if (commState.it == null) {
-                        if (!commState.putInt(ldrParties.size()))
+                        if (!commState.putInt(null, ldrParties.size()))
                             return false;
 
                         commState.it = ldrParties.entrySet().iterator();
@@ -345,13 +345,13 @@ public class GridEventStorageMessage extends GridTcpCommunicationMessageAdapter
                         Map.Entry<UUID, IgniteUuid> e = (Map.Entry<UUID, IgniteUuid>)commState.cur;
 
                         if (!commState.keyDone) {
-                            if (!commState.putUuid(e.getKey()))
+                            if (!commState.putUuid(null, e.getKey()))
                                 return false;
 
                             commState.keyDone = true;
                         }
 
-                        if (!commState.putGridUuid(e.getValue()))
+                        if (!commState.putGridUuid(null, e.getValue()))
                             return false;
 
                         commState.keyDone = false;
@@ -361,20 +361,20 @@ public class GridEventStorageMessage extends GridTcpCommunicationMessageAdapter
 
                     commState.it = null;
                 } else {
-                    if (!commState.putInt(-1))
+                    if (!commState.putInt(null, -1))
                         return false;
                 }
 
                 commState.idx++;
 
             case 7:
-                if (!commState.putByteArray(resTopicBytes))
+                if (!commState.putByteArray(null, resTopicBytes))
                     return false;
 
                 commState.idx++;
 
             case 8:
-                if (!commState.putString(userVer))
+                if (!commState.putString(null, userVer))
                     return false;
 
                 commState.idx++;
@@ -391,7 +391,7 @@ public class GridEventStorageMessage extends GridTcpCommunicationMessageAdapter
 
         switch (commState.idx) {
             case 0:
-                IgniteUuid clsLdrId0 = commState.getGridUuid();
+                IgniteUuid clsLdrId0 = commState.getGridUuid(null);
 
                 if (clsLdrId0 == GRID_UUID_NOT_READ)
                     return false;
@@ -404,14 +404,14 @@ public class GridEventStorageMessage extends GridTcpCommunicationMessageAdapter
                 if (buf.remaining() < 1)
                     return false;
 
-                byte depMode0 = commState.getByte();
+                byte depMode0 = commState.getByte(null);
 
                 depMode = IgniteDeploymentMode.fromOrdinal(depMode0);
 
                 commState.idx++;
 
             case 2:
-                byte[] evtsBytes0 = commState.getByteArray();
+                byte[] evtsBytes0 = commState.getByteArray(null);
 
                 if (evtsBytes0 == BYTE_ARR_NOT_READ)
                     return false;
@@ -421,7 +421,7 @@ public class GridEventStorageMessage extends GridTcpCommunicationMessageAdapter
                 commState.idx++;
 
             case 3:
-                byte[] exBytes0 = commState.getByteArray();
+                byte[] exBytes0 = commState.getByteArray(null);
 
                 if (exBytes0 == BYTE_ARR_NOT_READ)
                     return false;
@@ -431,7 +431,7 @@ public class GridEventStorageMessage extends GridTcpCommunicationMessageAdapter
                 commState.idx++;
 
             case 4:
-                byte[] filter0 = commState.getByteArray();
+                byte[] filter0 = commState.getByteArray(null);
 
                 if (filter0 == BYTE_ARR_NOT_READ)
                     return false;
@@ -441,7 +441,7 @@ public class GridEventStorageMessage extends GridTcpCommunicationMessageAdapter
                 commState.idx++;
 
             case 5:
-                String filterClsName0 = commState.getString();
+                String filterClsName0 = commState.getString(null);
 
                 if (filterClsName0 == STR_NOT_READ)
                     return false;
@@ -455,7 +455,7 @@ public class GridEventStorageMessage extends GridTcpCommunicationMessageAdapter
                     if (buf.remaining() < 4)
                         return false;
 
-                    commState.readSize = commState.getInt();
+                    commState.readSize = commState.getInt(null);
                 }
 
                 if (commState.readSize >= 0) {
@@ -464,7 +464,7 @@ public class GridEventStorageMessage extends GridTcpCommunicationMessageAdapter
 
                     for (int i = commState.readItems; i < commState.readSize; i++) {
                         if (!commState.keyDone) {
-                            UUID _val = commState.getUuid();
+                            UUID _val = commState.getUuid(null);
 
                             if (_val == UUID_NOT_READ)
                                 return false;
@@ -473,7 +473,7 @@ public class GridEventStorageMessage extends GridTcpCommunicationMessageAdapter
                             commState.keyDone = true;
                         }
 
-                        IgniteUuid _val = commState.getGridUuid();
+                        IgniteUuid _val = commState.getGridUuid(null);
 
                         if (_val == GRID_UUID_NOT_READ)
                             return false;
@@ -493,7 +493,7 @@ public class GridEventStorageMessage extends GridTcpCommunicationMessageAdapter
                 commState.idx++;
 
             case 7:
-                byte[] resTopicBytes0 = commState.getByteArray();
+                byte[] resTopicBytes0 = commState.getByteArray(null);
 
                 if (resTopicBytes0 == BYTE_ARR_NOT_READ)
                     return false;
@@ -503,7 +503,7 @@ public class GridEventStorageMessage extends GridTcpCommunicationMessageAdapter
                 commState.idx++;
 
             case 8:
-                String userVer0 = commState.getString();
+                String userVer0 = commState.getString(null);
 
                 if (userVer0 == STR_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/GridCacheEvictionRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEvictionRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEvictionRequest.java
index fd36e15..8a1f0b9 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEvictionRequest.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEvictionRequest.java
@@ -161,7 +161,7 @@ public class GridCacheEvictionRequest<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;
@@ -169,19 +169,19 @@ public class GridCacheEvictionRequest<K, V> extends GridCacheMessage<K, V> imple
 
         switch (commState.idx) {
             case 3:
-                if (!commState.putByteArray(entriesBytes))
+                if (!commState.putByteArray(null, entriesBytes))
                     return false;
 
                 commState.idx++;
 
             case 4:
-                if (!commState.putLong(futId))
+                if (!commState.putLong(null, futId))
                     return false;
 
                 commState.idx++;
 
             case 5:
-                if (!commState.putLong(topVer))
+                if (!commState.putLong(null, topVer))
                     return false;
 
                 commState.idx++;
@@ -201,7 +201,7 @@ public class GridCacheEvictionRequest<K, V> extends GridCacheMessage<K, V> imple
 
         switch (commState.idx) {
             case 3:
-                byte[] entriesBytes0 = commState.getByteArray();
+                byte[] entriesBytes0 = commState.getByteArray(null);
 
                 if (entriesBytes0 == BYTE_ARR_NOT_READ)
                     return false;
@@ -214,7 +214,7 @@ public class GridCacheEvictionRequest<K, V> extends GridCacheMessage<K, V> imple
                 if (buf.remaining() < 8)
                     return false;
 
-                futId = commState.getLong();
+                futId = commState.getLong(null);
 
                 commState.idx++;
 
@@ -222,7 +222,7 @@ public class GridCacheEvictionRequest<K, V> extends GridCacheMessage<K, V> imple
                 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/GridCacheEvictionResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEvictionResponse.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEvictionResponse.java
index b241043..203b99d 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEvictionResponse.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEvictionResponse.java
@@ -151,7 +151,7 @@ public class GridCacheEvictionResponse<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;
@@ -159,13 +159,13 @@ public class GridCacheEvictionResponse<K, V> extends GridCacheMessage<K, V> {
 
         switch (commState.idx) {
             case 3:
-                if (!commState.putBoolean(err))
+                if (!commState.putBoolean(null, err))
                     return false;
 
                 commState.idx++;
 
             case 4:
-                if (!commState.putLong(futId))
+                if (!commState.putLong(null, futId))
                     return false;
 
                 commState.idx++;
@@ -173,7 +173,7 @@ public class GridCacheEvictionResponse<K, V> extends GridCacheMessage<K, V> {
             case 5:
                 if (rejectedKeyBytes != null) {
                     if (commState.it == null) {
-                        if (!commState.putInt(rejectedKeyBytes.size()))
+                        if (!commState.putInt(null, rejectedKeyBytes.size()))
                             return false;
 
                         commState.it = rejectedKeyBytes.iterator();
@@ -183,7 +183,7 @@ public class GridCacheEvictionResponse<K, V> extends GridCacheMessage<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;
@@ -191,7 +191,7 @@ public class GridCacheEvictionResponse<K, V> extends GridCacheMessage<K, V> {
 
                     commState.it = null;
                 } else {
-                    if (!commState.putInt(-1))
+                    if (!commState.putInt(null, -1))
                         return false;
                 }
 
@@ -215,7 +215,7 @@ public class GridCacheEvictionResponse<K, V> extends GridCacheMessage<K, V> {
                 if (buf.remaining() < 1)
                     return false;
 
-                err = commState.getBoolean();
+                err = commState.getBoolean(null);
 
                 commState.idx++;
 
@@ -223,7 +223,7 @@ public class GridCacheEvictionResponse<K, V> extends GridCacheMessage<K, V> {
                 if (buf.remaining() < 8)
                     return false;
 
-                futId = commState.getLong();
+                futId = commState.getLong(null);
 
                 commState.idx++;
 
@@ -232,7 +232,7 @@ public class GridCacheEvictionResponse<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) {
@@ -240,7 +240,7 @@ public class GridCacheEvictionResponse<K, V> extends GridCacheMessage<K, V> {
                         rejectedKeyBytes = 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/GridCacheMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMessage.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMessage.java
index 71eac41..ea7987d 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMessage.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMessage.java
@@ -586,7 +586,7 @@ public abstract class GridCacheMessage<K, V> extends GridTcpCommunicationMessage
         commState.setBuffer(buf);
 
         if (!commState.typeWritten) {
-            if (!commState.putByte(directType()))
+            if (!commState.putByte(null, directType()))
                 return false;
 
             commState.typeWritten = true;
@@ -594,19 +594,19 @@ public abstract class GridCacheMessage<K, V> extends GridTcpCommunicationMessage
 
         switch (commState.idx) {
             case 0:
-                if (!commState.putInt(cacheId))
+                if (!commState.putInt(null, cacheId))
                     return false;
 
                 commState.idx++;
 
             case 1:
-                if (!commState.putMessage(depInfo))
+                if (!commState.putMessage(null, depInfo))
                     return false;
 
                 commState.idx++;
 
             case 2:
-                if (!commState.putLong(msgId))
+                if (!commState.putLong(null, msgId))
                     return false;
 
                 commState.idx++;
@@ -626,12 +626,12 @@ public abstract class GridCacheMessage<K, V> extends GridTcpCommunicationMessage
                 if (buf.remaining() < 4)
                     return false;
 
-                cacheId = commState.getInt();
+                cacheId = commState.getInt(null);
 
                 commState.idx++;
 
             case 1:
-                Object depInfo0 = commState.getMessage();
+                Object depInfo0 = commState.getMessage(null);
 
                 if (depInfo0 == MSG_NOT_READ)
                     return false;
@@ -644,7 +644,7 @@ public abstract class GridCacheMessage<K, V> extends GridTcpCommunicationMessage
                 if (buf.remaining() < 8)
                     return false;
 
-                msgId = commState.getLong();
+                msgId = 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/GridCacheOptimisticCheckPreparedTxRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxRequest.java
index 693f1ff..88c087f 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxRequest.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxRequest.java
@@ -118,7 +118,7 @@ public class GridCacheOptimisticCheckPreparedTxRequest<K, V> extends GridDistrib
             return false;
 
         if (!commState.typeWritten) {
-            if (!commState.putByte(directType()))
+            if (!commState.putByte(null, directType()))
                 return false;
 
             commState.typeWritten = true;
@@ -126,25 +126,25 @@ public class GridCacheOptimisticCheckPreparedTxRequest<K, V> extends GridDistrib
 
         switch (commState.idx) {
             case 8:
-                if (!commState.putGridUuid(futId))
+                if (!commState.putGridUuid(null, futId))
                     return false;
 
                 commState.idx++;
 
             case 9:
-                if (!commState.putGridUuid(miniId))
+                if (!commState.putGridUuid(null, miniId))
                     return false;
 
                 commState.idx++;
 
             case 10:
-                if (!commState.putCacheVersion(nearXidVer))
+                if (!commState.putCacheVersion(null, nearXidVer))
                     return false;
 
                 commState.idx++;
 
             case 11:
-                if (!commState.putInt(txNum))
+                if (!commState.putInt(null, txNum))
                     return false;
 
                 commState.idx++;
@@ -164,7 +164,7 @@ public class GridCacheOptimisticCheckPreparedTxRequest<K, V> extends GridDistrib
 
         switch (commState.idx) {
             case 8:
-                IgniteUuid futId0 = commState.getGridUuid();
+                IgniteUuid futId0 = commState.getGridUuid(null);
 
                 if (futId0 == GRID_UUID_NOT_READ)
                     return false;
@@ -174,7 +174,7 @@ public class GridCacheOptimisticCheckPreparedTxRequest<K, V> extends GridDistrib
                 commState.idx++;
 
             case 9:
-                IgniteUuid miniId0 = commState.getGridUuid();
+                IgniteUuid miniId0 = commState.getGridUuid(null);
 
                 if (miniId0 == GRID_UUID_NOT_READ)
                     return false;
@@ -184,7 +184,7 @@ public class GridCacheOptimisticCheckPreparedTxRequest<K, V> extends GridDistrib
                 commState.idx++;
 
             case 10:
-                GridCacheVersion nearXidVer0 = commState.getCacheVersion();
+                GridCacheVersion nearXidVer0 = commState.getCacheVersion(null);
 
                 if (nearXidVer0 == CACHE_VER_NOT_READ)
                     return false;
@@ -197,7 +197,7 @@ public class GridCacheOptimisticCheckPreparedTxRequest<K, V> extends GridDistrib
                 if (buf.remaining() < 4)
                     return false;
 
-                txNum = commState.getInt();
+                txNum = 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/GridCacheOptimisticCheckPreparedTxResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxResponse.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxResponse.java
index 21c2256..1baa17a 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxResponse.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxResponse.java
@@ -106,7 +106,7 @@ public class GridCacheOptimisticCheckPreparedTxResponse<K, V> extends GridDistri
             return false;
 
         if (!commState.typeWritten) {
-            if (!commState.putByte(directType()))
+            if (!commState.putByte(null, directType()))
                 return false;
 
             commState.typeWritten = true;
@@ -114,19 +114,19 @@ public class GridCacheOptimisticCheckPreparedTxResponse<K, V> extends GridDistri
 
         switch (commState.idx) {
             case 8:
-                if (!commState.putGridUuid(futId))
+                if (!commState.putGridUuid(null, futId))
                     return false;
 
                 commState.idx++;
 
             case 9:
-                if (!commState.putGridUuid(miniId))
+                if (!commState.putGridUuid(null, miniId))
                     return false;
 
                 commState.idx++;
 
             case 10:
-                if (!commState.putBoolean(success))
+                if (!commState.putBoolean(null, success))
                     return false;
 
                 commState.idx++;
@@ -146,7 +146,7 @@ public class GridCacheOptimisticCheckPreparedTxResponse<K, V> extends GridDistri
 
         switch (commState.idx) {
             case 8:
-                IgniteUuid futId0 = commState.getGridUuid();
+                IgniteUuid futId0 = commState.getGridUuid(null);
 
                 if (futId0 == GRID_UUID_NOT_READ)
                     return false;
@@ -156,7 +156,7 @@ public class GridCacheOptimisticCheckPreparedTxResponse<K, V> extends GridDistri
                 commState.idx++;
 
             case 9:
-                IgniteUuid miniId0 = commState.getGridUuid();
+                IgniteUuid miniId0 = commState.getGridUuid(null);
 
                 if (miniId0 == GRID_UUID_NOT_READ)
                     return false;
@@ -169,7 +169,7 @@ public class GridCacheOptimisticCheckPreparedTxResponse<K, V> extends GridDistri
                 if (buf.remaining() < 1)
                     return false;
 
-                success = commState.getBoolean();
+                success = commState.getBoolean(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/GridCachePessimisticCheckCommittedTxRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxRequest.java
index b7f8c2a..89b1a4b 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxRequest.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxRequest.java
@@ -153,7 +153,7 @@ public class GridCachePessimisticCheckCommittedTxRequest<K, V> extends GridDistr
             return false;
 
         if (!commState.typeWritten) {
-            if (!commState.putByte(directType()))
+            if (!commState.putByte(null, directType()))
                 return false;
 
             commState.typeWritten = true;
@@ -161,37 +161,37 @@ public class GridCachePessimisticCheckCommittedTxRequest<K, V> extends GridDistr
 
         switch (commState.idx) {
             case 8:
-                if (!commState.putGridUuid(futId))
+                if (!commState.putGridUuid(null, futId))
                     return false;
 
                 commState.idx++;
 
             case 9:
-                if (!commState.putGridUuid(miniId))
+                if (!commState.putGridUuid(null, miniId))
                     return false;
 
                 commState.idx++;
 
             case 10:
-                if (!commState.putCacheVersion(nearXidVer))
+                if (!commState.putCacheVersion(null, nearXidVer))
                     return false;
 
                 commState.idx++;
 
             case 11:
-                if (!commState.putUuid(originatingNodeId))
+                if (!commState.putUuid(null, originatingNodeId))
                     return false;
 
                 commState.idx++;
 
             case 12:
-                if (!commState.putLong(originatingThreadId))
+                if (!commState.putLong(null, originatingThreadId))
                     return false;
 
                 commState.idx++;
 
             case 13:
-                if (!commState.putBoolean(nearOnlyCheck))
+                if (!commState.putBoolean(null, nearOnlyCheck))
                     return false;
 
                 commState.idx++;
@@ -211,7 +211,7 @@ public class GridCachePessimisticCheckCommittedTxRequest<K, V> extends GridDistr
 
         switch (commState.idx) {
             case 8:
-                IgniteUuid futId0 = commState.getGridUuid();
+                IgniteUuid futId0 = commState.getGridUuid(null);
 
                 if (futId0 == GRID_UUID_NOT_READ)
                     return false;
@@ -221,7 +221,7 @@ public class GridCachePessimisticCheckCommittedTxRequest<K, V> extends GridDistr
                 commState.idx++;
 
             case 9:
-                IgniteUuid miniId0 = commState.getGridUuid();
+                IgniteUuid miniId0 = commState.getGridUuid(null);
 
                 if (miniId0 == GRID_UUID_NOT_READ)
                     return false;
@@ -231,7 +231,7 @@ public class GridCachePessimisticCheckCommittedTxRequest<K, V> extends GridDistr
                 commState.idx++;
 
             case 10:
-                GridCacheVersion nearXidVer0 = commState.getCacheVersion();
+                GridCacheVersion nearXidVer0 = commState.getCacheVersion(null);
 
                 if (nearXidVer0 == CACHE_VER_NOT_READ)
                     return false;
@@ -241,7 +241,7 @@ public class GridCachePessimisticCheckCommittedTxRequest<K, V> extends GridDistr
                 commState.idx++;
 
             case 11:
-                UUID originatingNodeId0 = commState.getUuid();
+                UUID originatingNodeId0 = commState.getUuid(null);
 
                 if (originatingNodeId0 == UUID_NOT_READ)
                     return false;
@@ -254,7 +254,7 @@ public class GridCachePessimisticCheckCommittedTxRequest<K, V> extends GridDistr
                 if (buf.remaining() < 8)
                     return false;
 
-                originatingThreadId = commState.getLong();
+                originatingThreadId = commState.getLong(null);
 
                 commState.idx++;
 
@@ -262,7 +262,7 @@ public class GridCachePessimisticCheckCommittedTxRequest<K, V> extends GridDistr
                 if (buf.remaining() < 1)
                     return false;
 
-                nearOnlyCheck = commState.getBoolean();
+                nearOnlyCheck = commState.getBoolean(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/GridCachePessimisticCheckCommittedTxResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxResponse.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxResponse.java
index 529edcb..88f354b 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxResponse.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxResponse.java
@@ -137,7 +137,7 @@ public class GridCachePessimisticCheckCommittedTxResponse<K, V> extends GridDist
             return false;
 
         if (!commState.typeWritten) {
-            if (!commState.putByte(directType()))
+            if (!commState.putByte(null, directType()))
                 return false;
 
             commState.typeWritten = true;
@@ -145,19 +145,19 @@ public class GridCachePessimisticCheckCommittedTxResponse<K, V> extends GridDist
 
         switch (commState.idx) {
             case 8:
-                if (!commState.putByteArray(committedTxInfoBytes))
+                if (!commState.putByteArray(null, committedTxInfoBytes))
                     return false;
 
                 commState.idx++;
 
             case 9:
-                if (!commState.putGridUuid(futId))
+                if (!commState.putGridUuid(null, futId))
                     return false;
 
                 commState.idx++;
 
             case 10:
-                if (!commState.putGridUuid(miniId))
+                if (!commState.putGridUuid(null, miniId))
                     return false;
 
                 commState.idx++;
@@ -177,7 +177,7 @@ public class GridCachePessimisticCheckCommittedTxResponse<K, V> extends GridDist
 
         switch (commState.idx) {
             case 8:
-                byte[] committedTxInfoBytes0 = commState.getByteArray();
+                byte[] committedTxInfoBytes0 = commState.getByteArray(null);
 
                 if (committedTxInfoBytes0 == BYTE_ARR_NOT_READ)
                     return false;
@@ -187,7 +187,7 @@ public class GridCachePessimisticCheckCommittedTxResponse<K, V> extends GridDist
                 commState.idx++;
 
             case 9:
-                IgniteUuid futId0 = commState.getGridUuid();
+                IgniteUuid futId0 = commState.getGridUuid(null);
 
                 if (futId0 == GRID_UUID_NOT_READ)
                     return false;
@@ -197,7 +197,7 @@ public class GridCachePessimisticCheckCommittedTxResponse<K, V> extends GridDist
                 commState.idx++;
 
             case 10:
-                IgniteUuid miniId0 = commState.getGridUuid();
+                IgniteUuid miniId0 = commState.getGridUuid(null);
 
                 if (miniId0 == GRID_UUID_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/GridDistributedBaseMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedBaseMessage.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedBaseMessage.java
index fd96d32..3a0a86f 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedBaseMessage.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedBaseMessage.java
@@ -255,7 +255,7 @@ public abstract class GridDistributedBaseMessage<K, V> extends GridCacheMessage<
             return false;
 
         if (!commState.typeWritten) {
-            if (!commState.putByte(directType()))
+            if (!commState.putByte(null, directType()))
                 return false;
 
             commState.typeWritten = true;
@@ -263,13 +263,13 @@ public abstract class GridDistributedBaseMessage<K, V> extends GridCacheMessage<
 
         switch (commState.idx) {
             case 3:
-                if (!commState.putByteArray(candsByIdxBytes))
+                if (!commState.putByteArray(null, candsByIdxBytes))
                     return false;
 
                 commState.idx++;
 
             case 4:
-                if (!commState.putByteArray(candsByKeyBytes))
+                if (!commState.putByteArray(null, candsByKeyBytes))
                     return false;
 
                 commState.idx++;
@@ -277,7 +277,7 @@ public abstract class GridDistributedBaseMessage<K, V> extends GridCacheMessage<
             case 5:
                 if (committedVers != null) {
                     if (commState.it == null) {
-                        if (!commState.putInt(committedVers.size()))
+                        if (!commState.putInt(null, committedVers.size()))
                             return false;
 
                         commState.it = committedVers.iterator();
@@ -287,7 +287,7 @@ public abstract class GridDistributedBaseMessage<K, V> extends GridCacheMessage<
                         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;
@@ -295,7 +295,7 @@ public abstract class GridDistributedBaseMessage<K, V> extends GridCacheMessage<
 
                     commState.it = null;
                 } else {
-                    if (!commState.putInt(-1))
+                    if (!commState.putInt(null, -1))
                         return false;
                 }
 
@@ -304,7 +304,7 @@ public abstract class GridDistributedBaseMessage<K, V> extends GridCacheMessage<
             case 6:
                 if (rolledbackVers != null) {
                     if (commState.it == null) {
-                        if (!commState.putInt(rolledbackVers.size()))
+                        if (!commState.putInt(null, rolledbackVers.size()))
                             return false;
 
                         commState.it = rolledbackVers.iterator();
@@ -314,7 +314,7 @@ public abstract class GridDistributedBaseMessage<K, V> extends GridCacheMessage<
                         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;
@@ -322,14 +322,14 @@ public abstract class GridDistributedBaseMessage<K, V> extends GridCacheMessage<
 
                     commState.it = null;
                 } else {
-                    if (!commState.putInt(-1))
+                    if (!commState.putInt(null, -1))
                         return false;
                 }
 
                 commState.idx++;
 
             case 7:
-                if (!commState.putCacheVersion(ver))
+                if (!commState.putCacheVersion(null, ver))
                     return false;
 
                 commState.idx++;
@@ -349,7 +349,7 @@ public abstract class GridDistributedBaseMessage<K, V> extends GridCacheMessage<
 
         switch (commState.idx) {
             case 3:
-                byte[] candsByIdxBytes0 = commState.getByteArray();
+                byte[] candsByIdxBytes0 = commState.getByteArray(null);
 
                 if (candsByIdxBytes0 == BYTE_ARR_NOT_READ)
                     return false;
@@ -359,7 +359,7 @@ public abstract class GridDistributedBaseMessage<K, V> extends GridCacheMessage<
                 commState.idx++;
 
             case 4:
-                byte[] candsByKeyBytes0 = commState.getByteArray();
+                byte[] candsByKeyBytes0 = commState.getByteArray(null);
 
                 if (candsByKeyBytes0 == BYTE_ARR_NOT_READ)
                     return false;
@@ -373,7 +373,7 @@ public abstract class GridDistributedBaseMessage<K, V> extends GridCacheMessage<
                     if (buf.remaining() < 4)
                         return false;
 
-                    commState.readSize = commState.getInt();
+                    commState.readSize = commState.getInt(null);
                 }
 
                 if (commState.readSize >= 0) {
@@ -381,7 +381,7 @@ public abstract class GridDistributedBaseMessage<K, V> extends GridCacheMessage<
                         committedVers = 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;
@@ -402,7 +402,7 @@ public abstract class GridDistributedBaseMessage<K, V> extends GridCacheMessage<
                     if (buf.remaining() < 4)
                         return false;
 
-                    commState.readSize = commState.getInt();
+                    commState.readSize = commState.getInt(null);
                 }
 
                 if (commState.readSize >= 0) {
@@ -410,7 +410,7 @@ public abstract class GridDistributedBaseMessage<K, V> extends GridCacheMessage<
                         rolledbackVers = 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;
@@ -427,7 +427,7 @@ public abstract class GridDistributedBaseMessage<K, V> extends GridCacheMessage<
                 commState.idx++;
 
             case 7:
-                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/GridDistributedLockRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedLockRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedLockRequest.java
index 519c3b7..add0721 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedLockRequest.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedLockRequest.java
@@ -463,7 +463,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage
             return false;
 
         if (!commState.typeWritten) {
-            if (!commState.putByte(directType()))
+            if (!commState.putByte(null, directType()))
                 return false;
 
             commState.typeWritten = true;
@@ -473,7 +473,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage
             case 8:
                 if (drVersByIdx != null) {
                     if (commState.it == null) {
-                        if (!commState.putInt(drVersByIdx.length))
+                        if (!commState.putInt(null, drVersByIdx.length))
                             return false;
 
                         commState.it = arrayIterator(drVersByIdx);
@@ -483,7 +483,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage
                         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;
@@ -491,44 +491,44 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage
 
                     commState.it = null;
                 } else {
-                    if (!commState.putInt(-1))
+                    if (!commState.putInt(null, -1))
                         return false;
                 }
 
                 commState.idx++;
 
             case 9:
-                if (!commState.putGridUuid(futId))
+                if (!commState.putGridUuid(null, futId))
                     return false;
 
                 commState.idx++;
 
             case 10:
-                if (!commState.putByteArray(grpLockKeyBytes))
+                if (!commState.putByteArray(null, grpLockKeyBytes))
                     return false;
 
                 commState.idx++;
 
             case 11:
-                if (!commState.putBoolean(isInTx))
+                if (!commState.putBoolean(null, isInTx))
                     return false;
 
                 commState.idx++;
 
             case 12:
-                if (!commState.putBoolean(isInvalidate))
+                if (!commState.putBoolean(null, isInvalidate))
                     return false;
 
                 commState.idx++;
 
             case 13:
-                if (!commState.putBoolean(isRead))
+                if (!commState.putBoolean(null, isRead))
                     return false;
 
                 commState.idx++;
 
             case 14:
-                if (!commState.putEnum(isolation))
+                if (!commState.putEnum(null, isolation))
                     return false;
 
                 commState.idx++;
@@ -536,7 +536,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage
             case 15:
                 if (keyBytes != null) {
                     if (commState.it == null) {
-                        if (!commState.putInt(keyBytes.size()))
+                        if (!commState.putInt(null, keyBytes.size()))
                             return false;
 
                         commState.it = keyBytes.iterator();
@@ -546,7 +546,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage
                         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;
@@ -554,56 +554,56 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage
 
                     commState.it = null;
                 } else {
-                    if (!commState.putInt(-1))
+                    if (!commState.putInt(null, -1))
                         return false;
                 }
 
                 commState.idx++;
 
             case 16:
-                if (!commState.putCacheVersion(nearXidVer))
+                if (!commState.putCacheVersion(null, nearXidVer))
                     return false;
 
                 commState.idx++;
 
             case 17:
-                if (!commState.putUuid(nodeId))
+                if (!commState.putUuid(null, nodeId))
                     return false;
 
                 commState.idx++;
 
             case 18:
-                if (!commState.putBoolean(partLock))
+                if (!commState.putBoolean(null, partLock))
                     return false;
 
                 commState.idx++;
 
             case 19:
-                if (!commState.putBooleanArray(retVals))
+                if (!commState.putBooleanArray(null, retVals))
                     return false;
 
                 commState.idx++;
 
             case 20:
-                if (!commState.putLong(threadId))
+                if (!commState.putLong(null, threadId))
                     return false;
 
                 commState.idx++;
 
             case 21:
-                if (!commState.putLong(timeout))
+                if (!commState.putLong(null, timeout))
                     return false;
 
                 commState.idx++;
 
             case 22:
-                if (!commState.putInt(txSize))
+                if (!commState.putInt(null, txSize))
                     return false;
 
                 commState.idx++;
 
             case 23:
-                if (!commState.putByteArray(writeEntriesBytes))
+                if (!commState.putByteArray(null, writeEntriesBytes))
                     return false;
 
                 commState.idx++;
@@ -627,7 +627,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage
                     if (buf.remaining() < 4)
                         return false;
 
-                    commState.readSize = commState.getInt();
+                    commState.readSize = commState.getInt(null);
                 }
 
                 if (commState.readSize >= 0) {
@@ -635,7 +635,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage
                         drVersByIdx = 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;
@@ -652,7 +652,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage
                 commState.idx++;
 
             case 9:
-                IgniteUuid futId0 = commState.getGridUuid();
+                IgniteUuid futId0 = commState.getGridUuid(null);
 
                 if (futId0 == GRID_UUID_NOT_READ)
                     return false;
@@ -662,7 +662,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage
                 commState.idx++;
 
             case 10:
-                byte[] grpLockKeyBytes0 = commState.getByteArray();
+                byte[] grpLockKeyBytes0 = commState.getByteArray(null);
 
                 if (grpLockKeyBytes0 == BYTE_ARR_NOT_READ)
                     return false;
@@ -675,7 +675,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage
                 if (buf.remaining() < 1)
                     return false;
 
-                isInTx = commState.getBoolean();
+                isInTx = commState.getBoolean(null);
 
                 commState.idx++;
 
@@ -683,7 +683,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage
                 if (buf.remaining() < 1)
                     return false;
 
-                isInvalidate = commState.getBoolean();
+                isInvalidate = commState.getBoolean(null);
 
                 commState.idx++;
 
@@ -691,7 +691,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage
                 if (buf.remaining() < 1)
                     return false;
 
-                isRead = commState.getBoolean();
+                isRead = commState.getBoolean(null);
 
                 commState.idx++;
 
@@ -699,7 +699,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage
                 if (buf.remaining() < 1)
                     return false;
 
-                byte isolation0 = commState.getByte();
+                byte isolation0 = commState.getByte(null);
 
                 isolation = GridCacheTxIsolation.fromOrdinal(isolation0);
 
@@ -710,7 +710,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage
                     if (buf.remaining() < 4)
                         return false;
 
-                    commState.readSize = commState.getInt();
+                    commState.readSize = commState.getInt(null);
                 }
 
                 if (commState.readSize >= 0) {
@@ -718,7 +718,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage
                         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;
@@ -735,7 +735,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage
                 commState.idx++;
 
             case 16:
-                GridCacheVersion nearXidVer0 = commState.getCacheVersion();
+                GridCacheVersion nearXidVer0 = commState.getCacheVersion(null);
 
                 if (nearXidVer0 == CACHE_VER_NOT_READ)
                     return false;
@@ -745,7 +745,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage
                 commState.idx++;
 
             case 17:
-                UUID nodeId0 = commState.getUuid();
+                UUID nodeId0 = commState.getUuid(null);
 
                 if (nodeId0 == UUID_NOT_READ)
                     return false;
@@ -758,12 +758,12 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage
                 if (buf.remaining() < 1)
                     return false;
 
-                partLock = commState.getBoolean();
+                partLock = commState.getBoolean(null);
 
                 commState.idx++;
 
             case 19:
-                boolean[] retVals0 = commState.getBooleanArray();
+                boolean[] retVals0 = commState.getBooleanArray(null);
 
                 if (retVals0 == BOOLEAN_ARR_NOT_READ)
                     return false;
@@ -776,7 +776,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage
                 if (buf.remaining() < 8)
                     return false;
 
-                threadId = commState.getLong();
+                threadId = commState.getLong(null);
 
                 commState.idx++;
 
@@ -784,7 +784,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage
                 if (buf.remaining() < 8)
                     return false;
 
-                timeout = commState.getLong();
+                timeout = commState.getLong(null);
 
                 commState.idx++;
 
@@ -792,12 +792,12 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage
                 if (buf.remaining() < 4)
                     return false;
 
-                txSize = commState.getInt();
+                txSize = commState.getInt(null);
 
                 commState.idx++;
 
             case 23:
-                byte[] writeEntriesBytes0 = commState.getByteArray();
+                byte[] writeEntriesBytes0 = commState.getByteArray(null);
 
                 if (writeEntriesBytes0 == 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/GridDistributedLockResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedLockResponse.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedLockResponse.java
index 8edfc7c..cf94059 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedLockResponse.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedLockResponse.java
@@ -287,7 +287,7 @@ public class GridDistributedLockResponse<K, V> extends GridDistributedBaseMessag
             return false;
 
         if (!commState.typeWritten) {
-            if (!commState.putByte(directType()))
+            if (!commState.putByte(null, directType()))
                 return false;
 
             commState.typeWritten = true;
@@ -295,13 +295,13 @@ public class GridDistributedLockResponse<K, V> extends GridDistributedBaseMessag
 
         switch (commState.idx) {
             case 8:
-                if (!commState.putByteArray(errBytes))
+                if (!commState.putByteArray(null, errBytes))
                     return false;
 
                 commState.idx++;
 
             case 9:
-                if (!commState.putGridUuid(futId))
+                if (!commState.putGridUuid(null, futId))
                     return false;
 
                 commState.idx++;
@@ -309,7 +309,7 @@ public class GridDistributedLockResponse<K, V> extends GridDistributedBaseMessag
             case 10:
                 if (valBytes != null) {
                     if (commState.it == null) {
-                        if (!commState.putInt(valBytes.size()))
+                        if (!commState.putInt(null, valBytes.size()))
                             return false;
 
                         commState.it = valBytes.iterator();
@@ -319,7 +319,7 @@ public class GridDistributedLockResponse<K, V> extends GridDistributedBaseMessag
                         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;
@@ -327,7 +327,7 @@ public class GridDistributedLockResponse<K, V> extends GridDistributedBaseMessag
 
                     commState.it = null;
                 } else {
-                    if (!commState.putInt(-1))
+                    if (!commState.putInt(null, -1))
                         return false;
                 }
 
@@ -348,7 +348,7 @@ public class GridDistributedLockResponse<K, V> extends GridDistributedBaseMessag
 
         switch (commState.idx) {
             case 8:
-                byte[] errBytes0 = commState.getByteArray();
+                byte[] errBytes0 = commState.getByteArray(null);
 
                 if (errBytes0 == BYTE_ARR_NOT_READ)
                     return false;
@@ -358,7 +358,7 @@ public class GridDistributedLockResponse<K, V> extends GridDistributedBaseMessag
                 commState.idx++;
 
             case 9:
-                IgniteUuid futId0 = commState.getGridUuid();
+                IgniteUuid futId0 = commState.getGridUuid(null);
 
                 if (futId0 == GRID_UUID_NOT_READ)
                     return false;
@@ -372,7 +372,7 @@ public class GridDistributedLockResponse<K, V> extends GridDistributedBaseMessag
                     if (buf.remaining() < 4)
                         return false;
 
-                    commState.readSize = commState.getInt();
+                    commState.readSize = commState.getInt(null);
                 }
 
                 if (commState.readSize >= 0) {
@@ -380,7 +380,7 @@ public class GridDistributedLockResponse<K, V> extends GridDistributedBaseMessag
                         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;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d21e6b4b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxFinishRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxFinishRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxFinishRequest.java
index d2093c2..8ffbc3d 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxFinishRequest.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxFinishRequest.java
@@ -361,7 +361,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes
             return false;
 
         if (!commState.typeWritten) {
-            if (!commState.putByte(directType()))
+            if (!commState.putByte(null, directType()))
                 return false;
 
             commState.typeWritten = true;
@@ -369,49 +369,49 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes
 
         switch (commState.idx) {
             case 8:
-                if (!commState.putCacheVersion(baseVer))
+                if (!commState.putCacheVersion(null, baseVer))
                     return false;
 
                 commState.idx++;
 
             case 9:
-                if (!commState.putBoolean(commit))
+                if (!commState.putBoolean(null, commit))
                     return false;
 
                 commState.idx++;
 
             case 10:
-                if (!commState.putCacheVersion(commitVer))
+                if (!commState.putCacheVersion(null, commitVer))
                     return false;
 
                 commState.idx++;
 
             case 11:
-                if (!commState.putGridUuid(futId))
+                if (!commState.putGridUuid(null, futId))
                     return false;
 
                 commState.idx++;
 
             case 12:
-                if (!commState.putByteArray(grpLockKeyBytes))
+                if (!commState.putByteArray(null, grpLockKeyBytes))
                     return false;
 
                 commState.idx++;
 
             case 13:
-                if (!commState.putBoolean(invalidate))
+                if (!commState.putBoolean(null, invalidate))
                     return false;
 
                 commState.idx++;
 
             case 14:
-                if (!commState.putBoolean(syncCommit))
+                if (!commState.putBoolean(null, syncCommit))
                     return false;
 
                 commState.idx++;
 
             case 15:
-                if (!commState.putBoolean(syncRollback))
+                if (!commState.putBoolean(null, syncRollback))
                     return false;
 
                 commState.idx++;
@@ -419,7 +419,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes
             case 16:
                 if (recoveryWritesBytes != null) {
                     if (commState.it == null) {
-                        if (!commState.putInt(recoveryWritesBytes.size()))
+                        if (!commState.putInt(null, recoveryWritesBytes.size()))
                             return false;
 
                         commState.it = recoveryWritesBytes.iterator();
@@ -429,7 +429,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes
                         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;
@@ -437,20 +437,20 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes
 
                     commState.it = null;
                 } else {
-                    if (!commState.putInt(-1))
+                    if (!commState.putInt(null, -1))
                         return false;
                 }
 
                 commState.idx++;
 
             case 17:
-                if (!commState.putLong(threadId))
+                if (!commState.putLong(null, threadId))
                     return false;
 
                 commState.idx++;
 
             case 18:
-                if (!commState.putInt(txSize))
+                if (!commState.putInt(null, txSize))
                     return false;
 
                 commState.idx++;
@@ -458,7 +458,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes
             case 19:
                 if (writeEntriesBytes != null) {
                     if (commState.it == null) {
-                        if (!commState.putInt(writeEntriesBytes.size()))
+                        if (!commState.putInt(null, writeEntriesBytes.size()))
                             return false;
 
                         commState.it = writeEntriesBytes.iterator();
@@ -468,7 +468,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes
                         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;
@@ -476,7 +476,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes
 
                     commState.it = null;
                 } else {
-                    if (!commState.putInt(-1))
+                    if (!commState.putInt(null, -1))
                         return false;
                 }
 
@@ -497,7 +497,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes
 
         switch (commState.idx) {
             case 8:
-                GridCacheVersion baseVer0 = commState.getCacheVersion();
+                GridCacheVersion baseVer0 = commState.getCacheVersion(null);
 
                 if (baseVer0 == CACHE_VER_NOT_READ)
                     return false;
@@ -510,12 +510,12 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes
                 if (buf.remaining() < 1)
                     return false;
 
-                commit = commState.getBoolean();
+                commit = commState.getBoolean(null);
 
                 commState.idx++;
 
             case 10:
-                GridCacheVersion commitVer0 = commState.getCacheVersion();
+                GridCacheVersion commitVer0 = commState.getCacheVersion(null);
 
                 if (commitVer0 == CACHE_VER_NOT_READ)
                     return false;
@@ -525,7 +525,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes
                 commState.idx++;
 
             case 11:
-                IgniteUuid futId0 = commState.getGridUuid();
+                IgniteUuid futId0 = commState.getGridUuid(null);
 
                 if (futId0 == GRID_UUID_NOT_READ)
                     return false;
@@ -535,7 +535,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes
                 commState.idx++;
 
             case 12:
-                byte[] grpLockKeyBytes0 = commState.getByteArray();
+                byte[] grpLockKeyBytes0 = commState.getByteArray(null);
 
                 if (grpLockKeyBytes0 == BYTE_ARR_NOT_READ)
                     return false;
@@ -548,7 +548,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes
                 if (buf.remaining() < 1)
                     return false;
 
-                invalidate = commState.getBoolean();
+                invalidate = commState.getBoolean(null);
 
                 commState.idx++;
 
@@ -556,7 +556,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes
                 if (buf.remaining() < 1)
                     return false;
 
-                syncCommit = commState.getBoolean();
+                syncCommit = commState.getBoolean(null);
 
                 commState.idx++;
 
@@ -564,7 +564,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes
                 if (buf.remaining() < 1)
                     return false;
 
-                syncRollback = commState.getBoolean();
+                syncRollback = commState.getBoolean(null);
 
                 commState.idx++;
 
@@ -573,7 +573,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes
                     if (buf.remaining() < 4)
                         return false;
 
-                    commState.readSize = commState.getInt();
+                    commState.readSize = commState.getInt(null);
                 }
 
                 if (commState.readSize >= 0) {
@@ -581,7 +581,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes
                         recoveryWritesBytes = 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;
@@ -601,7 +601,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes
                 if (buf.remaining() < 8)
                     return false;
 
-                threadId = commState.getLong();
+                threadId = commState.getLong(null);
 
                 commState.idx++;
 
@@ -609,7 +609,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes
                 if (buf.remaining() < 4)
                     return false;
 
-                txSize = commState.getInt();
+                txSize = commState.getInt(null);
 
                 commState.idx++;
 
@@ -618,7 +618,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes
                     if (buf.remaining() < 4)
                         return false;
 
-                    commState.readSize = commState.getInt();
+                    commState.readSize = commState.getInt(null);
                 }
 
                 if (commState.readSize >= 0) {
@@ -626,7 +626,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes
                         writeEntriesBytes = 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/GridDistributedTxFinishResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxFinishResponse.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxFinishResponse.java
index 4481668..eb68e05 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxFinishResponse.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxFinishResponse.java
@@ -94,7 +94,7 @@ public class GridDistributedTxFinishResponse<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;
@@ -102,13 +102,13 @@ public class GridDistributedTxFinishResponse<K, V> extends GridCacheMessage<K, V
 
         switch (commState.idx) {
             case 3:
-                if (!commState.putGridUuid(futId))
+                if (!commState.putGridUuid(null, futId))
                     return false;
 
                 commState.idx++;
 
             case 4:
-                if (!commState.putCacheVersion(txId))
+                if (!commState.putCacheVersion(null, txId))
                     return false;
 
                 commState.idx++;
@@ -128,7 +128,7 @@ public class GridDistributedTxFinishResponse<K, V> extends GridCacheMessage<K, V
 
         switch (commState.idx) {
             case 3:
-                IgniteUuid futId0 = commState.getGridUuid();
+                IgniteUuid futId0 = commState.getGridUuid(null);
 
                 if (futId0 == GRID_UUID_NOT_READ)
                     return false;
@@ -138,7 +138,7 @@ public class GridDistributedTxFinishResponse<K, V> extends GridCacheMessage<K, V
                 commState.idx++;
 
             case 4:
-                GridCacheVersion txId0 = commState.getCacheVersion();
+                GridCacheVersion txId0 = commState.getCacheVersion(null);
 
                 if (txId0 == 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/GridDistributedTxPrepareRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxPrepareRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
index 791c4f7..4aa4963 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
@@ -426,7 +426,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe
             return false;
 
         if (!commState.typeWritten) {
-            if (!commState.putByte(directType()))
+            if (!commState.putByte(null, directType()))
                 return false;
 
             commState.typeWritten = true;
@@ -434,43 +434,43 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe
 
         switch (commState.idx) {
             case 8:
-                if (!commState.putCacheVersion(commitVer))
+                if (!commState.putCacheVersion(null, commitVer))
                     return false;
 
                 commState.idx++;
 
             case 9:
-                if (!commState.putEnum(concurrency))
+                if (!commState.putEnum(null, concurrency))
                     return false;
 
                 commState.idx++;
 
             case 10:
-                if (!commState.putByteArray(dhtVersBytes))
+                if (!commState.putByteArray(null, dhtVersBytes))
                     return false;
 
                 commState.idx++;
 
             case 11:
-                if (!commState.putByteArray(grpLockKeyBytes))
+                if (!commState.putByteArray(null, grpLockKeyBytes))
                     return false;
 
                 commState.idx++;
 
             case 12:
-                if (!commState.putBoolean(invalidate))
+                if (!commState.putBoolean(null, invalidate))
                     return false;
 
                 commState.idx++;
 
             case 13:
-                if (!commState.putEnum(isolation))
+                if (!commState.putEnum(null, isolation))
                     return false;
 
                 commState.idx++;
 
             case 14:
-                if (!commState.putBoolean(partLock))
+                if (!commState.putBoolean(null, partLock))
                     return false;
 
                 commState.idx++;
@@ -478,7 +478,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe
             case 15:
                 if (readsBytes != null) {
                     if (commState.it == null) {
-                        if (!commState.putInt(readsBytes.size()))
+                        if (!commState.putInt(null, readsBytes.size()))
                             return false;
 
                         commState.it = readsBytes.iterator();
@@ -488,7 +488,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe
                         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;
@@ -496,32 +496,32 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe
 
                     commState.it = null;
                 } else {
-                    if (!commState.putInt(-1))
+                    if (!commState.putInt(null, -1))
                         return false;
                 }
 
                 commState.idx++;
 
             case 16:
-                if (!commState.putLong(threadId))
+                if (!commState.putLong(null, threadId))
                     return false;
 
                 commState.idx++;
 
             case 17:
-                if (!commState.putLong(timeout))
+                if (!commState.putLong(null, timeout))
                     return false;
 
                 commState.idx++;
 
             case 18:
-                if (!commState.putByteArray(txNodesBytes))
+                if (!commState.putByteArray(null, txNodesBytes))
                     return false;
 
                 commState.idx++;
 
             case 19:
-                if (!commState.putInt(txSize))
+                if (!commState.putInt(null, txSize))
                     return false;
 
                 commState.idx++;
@@ -529,7 +529,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe
             case 20:
                 if (writesBytes != null) {
                     if (commState.it == null) {
-                        if (!commState.putInt(writesBytes.size()))
+                        if (!commState.putInt(null, writesBytes.size()))
                             return false;
 
                         commState.it = writesBytes.iterator();
@@ -539,7 +539,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe
                         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;
@@ -547,7 +547,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe
 
                     commState.it = null;
                 } else {
-                    if (!commState.putInt(-1))
+                    if (!commState.putInt(null, -1))
                         return false;
                 }
 
@@ -568,7 +568,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe
 
         switch (commState.idx) {
             case 8:
-                GridCacheVersion commitVer0 = commState.getCacheVersion();
+                GridCacheVersion commitVer0 = commState.getCacheVersion(null);
 
                 if (commitVer0 == CACHE_VER_NOT_READ)
                     return false;
@@ -581,14 +581,14 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe
                 if (buf.remaining() < 1)
                     return false;
 
-                byte concurrency0 = commState.getByte();
+                byte concurrency0 = commState.getByte(null);
 
                 concurrency = GridCacheTxConcurrency.fromOrdinal(concurrency0);
 
                 commState.idx++;
 
             case 10:
-                byte[] dhtVersBytes0 = commState.getByteArray();
+                byte[] dhtVersBytes0 = commState.getByteArray(null);
 
                 if (dhtVersBytes0 == BYTE_ARR_NOT_READ)
                     return false;
@@ -598,7 +598,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe
                 commState.idx++;
 
             case 11:
-                byte[] grpLockKeyBytes0 = commState.getByteArray();
+                byte[] grpLockKeyBytes0 = commState.getByteArray(null);
 
                 if (grpLockKeyBytes0 == BYTE_ARR_NOT_READ)
                     return false;
@@ -611,7 +611,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe
                 if (buf.remaining() < 1)
                     return false;
 
-                invalidate = commState.getBoolean();
+                invalidate = commState.getBoolean(null);
 
                 commState.idx++;
 
@@ -619,7 +619,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe
                 if (buf.remaining() < 1)
                     return false;
 
-                byte isolation0 = commState.getByte();
+                byte isolation0 = commState.getByte(null);
 
                 isolation = GridCacheTxIsolation.fromOrdinal(isolation0);
 
@@ -629,7 +629,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe
                 if (buf.remaining() < 1)
                     return false;
 
-                partLock = commState.getBoolean();
+                partLock = commState.getBoolean(null);
 
                 commState.idx++;
 
@@ -638,7 +638,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe
                     if (buf.remaining() < 4)
                         return false;
 
-                    commState.readSize = commState.getInt();
+                    commState.readSize = commState.getInt(null);
                 }
 
                 if (commState.readSize >= 0) {
@@ -646,7 +646,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe
                         readsBytes = 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;
@@ -666,7 +666,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe
                 if (buf.remaining() < 8)
                     return false;
 
-                threadId = commState.getLong();
+                threadId = commState.getLong(null);
 
                 commState.idx++;
 
@@ -674,12 +674,12 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe
                 if (buf.remaining() < 8)
                     return false;
 
-                timeout = commState.getLong();
+                timeout = commState.getLong(null);
 
                 commState.idx++;
 
             case 18:
-                byte[] txNodesBytes0 = commState.getByteArray();
+                byte[] txNodesBytes0 = commState.getByteArray(null);
 
                 if (txNodesBytes0 == BYTE_ARR_NOT_READ)
                     return false;
@@ -692,7 +692,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe
                 if (buf.remaining() < 4)
                     return false;
 
-                txSize = commState.getInt();
+                txSize = commState.getInt(null);
 
                 commState.idx++;
 
@@ -701,7 +701,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe
                     if (buf.remaining() < 4)
                         return false;
 
-                    commState.readSize = commState.getInt();
+                    commState.readSize = commState.getInt(null);
                 }
 
                 if (commState.readSize >= 0) {
@@ -709,7 +709,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe
                         writesBytes = 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/GridDistributedTxPrepareResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxPrepareResponse.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxPrepareResponse.java
index 2987382..2754c9e 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxPrepareResponse.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxPrepareResponse.java
@@ -171,7 +171,7 @@ public class GridDistributedTxPrepareResponse<K, V> extends GridDistributedBaseM
             return false;
 
         if (!commState.typeWritten) {
-            if (!commState.putByte(directType()))
+            if (!commState.putByte(null, directType()))
                 return false;
 
             commState.typeWritten = true;
@@ -179,13 +179,13 @@ public class GridDistributedTxPrepareResponse<K, V> extends GridDistributedBaseM
 
         switch (commState.idx) {
             case 8:
-                if (!commState.putByteArray(candsBytes))
+                if (!commState.putByteArray(null, candsBytes))
                     return false;
 
                 commState.idx++;
 
             case 9:
-                if (!commState.putByteArray(errBytes))
+                if (!commState.putByteArray(null, errBytes))
                     return false;
 
                 commState.idx++;
@@ -205,7 +205,7 @@ public class GridDistributedTxPrepareResponse<K, V> extends GridDistributedBaseM
 
         switch (commState.idx) {
             case 8:
-                byte[] candsBytes0 = commState.getByteArray();
+                byte[] candsBytes0 = commState.getByteArray(null);
 
                 if (candsBytes0 == BYTE_ARR_NOT_READ)
                     return false;
@@ -215,7 +215,7 @@ public class GridDistributedTxPrepareResponse<K, V> extends GridDistributedBaseM
                 commState.idx++;
 
             case 9:
-                byte[] errBytes0 = commState.getByteArray();
+                byte[] errBytes0 = commState.getByteArray(null);
 
                 if (errBytes0 == 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/GridDistributedUnlockRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedUnlockRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedUnlockRequest.java
index 93e3ccf..aa0772e 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedUnlockRequest.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedUnlockRequest.java
@@ -136,7 +136,7 @@ public class GridDistributedUnlockRequest<K, V> extends GridDistributedBaseMessa
             return false;
 
         if (!commState.typeWritten) {
-            if (!commState.putByte(directType()))
+            if (!commState.putByte(null, directType()))
                 return false;
 
             commState.typeWritten = true;
@@ -146,7 +146,7 @@ public class GridDistributedUnlockRequest<K, V> extends GridDistributedBaseMessa
             case 8:
                 if (keyBytes != null) {
                     if (commState.it == null) {
-                        if (!commState.putInt(keyBytes.size()))
+                        if (!commState.putInt(null, keyBytes.size()))
                             return false;
 
                         commState.it = keyBytes.iterator();
@@ -156,7 +156,7 @@ public class GridDistributedUnlockRequest<K, V> extends GridDistributedBaseMessa
                         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;
@@ -164,7 +164,7 @@ public class GridDistributedUnlockRequest<K, V> extends GridDistributedBaseMessa
 
                     commState.it = null;
                 } else {
-                    if (!commState.putInt(-1))
+                    if (!commState.putInt(null, -1))
                         return false;
                 }
 
@@ -189,7 +189,7 @@ public class GridDistributedUnlockRequest<K, V> extends GridDistributedBaseMessa
                     if (buf.remaining() < 4)
                         return false;
 
-                    commState.readSize = commState.getInt();
+                    commState.readSize = commState.getInt(null);
                 }
 
                 if (commState.readSize >= 0) {
@@ -197,7 +197,7 @@ public class GridDistributedUnlockRequest<K, V> extends GridDistributedBaseMessa
                         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;


Mime
View raw message