You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vk...@apache.org on 2014/12/23 00:40:13 UTC
[19/20] incubator-ignite git commit: IGNITE-61 - Portable format in
direct marshalling
IGNITE-61 - Portable format in direct marshalling
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f5b3f26e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f5b3f26e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f5b3f26e
Branch: refs/heads/ignite-61
Commit: f5b3f26e4ff9f8dbcbd1089aa9ddd309e462edc6
Parents: d0ecc3f
Author: Valentin Kulichenko <vk...@gridgain.com>
Authored: Mon Dec 22 14:39:29 2014 -0800
Committer: Valentin Kulichenko <vk...@gridgain.com>
Committed: Mon Dec 22 14:39:29 2014 -0800
----------------------------------------------------------------------
.../jobstealing/JobStealingRequest.java | 12 +--
.../grid/kernal/GridJobCancelRequest.java | 12 +--
.../grid/kernal/GridJobExecuteRequest.java | 80 ++++++++---------
.../grid/kernal/GridJobExecuteRequestV2.java | 4 +-
.../grid/kernal/GridJobExecuteResponse.java | 28 +++---
.../grid/kernal/GridJobSiblingsRequest.java | 8 +-
.../grid/kernal/GridJobSiblingsResponse.java | 4 +-
.../grid/kernal/GridTaskCancelRequest.java | 4 +-
.../grid/kernal/GridTaskSessionRequest.java | 12 +--
.../checkpoint/GridCheckpointRequest.java | 12 +--
.../managers/communication/GridIoMessage.java | 28 +++---
.../communication/GridIoUserMessage.java | 26 +++---
.../deployment/GridDeploymentInfoBean.java | 18 ++--
.../deployment/GridDeploymentRequest.java | 16 ++--
.../deployment/GridDeploymentResponse.java | 12 +--
.../eventstorage/GridEventStorageMessage.java | 34 ++++----
.../cache/GridCacheEvictionRequest.java | 12 +--
.../cache/GridCacheEvictionResponse.java | 8 +-
.../processors/cache/GridCacheMessage.java | 12 +--
...idCacheOptimisticCheckPreparedTxRequest.java | 16 ++--
...dCacheOptimisticCheckPreparedTxResponse.java | 12 +--
...CachePessimisticCheckCommittedTxRequest.java | 24 +++---
...achePessimisticCheckCommittedTxResponse.java | 12 +--
.../distributed/GridDistributedBaseMessage.java | 12 +--
.../distributed/GridDistributedLockRequest.java | 56 ++++++------
.../GridDistributedLockResponse.java | 8 +-
.../GridDistributedTxFinishRequest.java | 90 ++++++++++----------
.../GridDistributedTxFinishResponse.java | 8 +-
.../GridDistributedTxPrepareRequest.java | 44 +++++-----
.../GridDistributedTxPrepareResponse.java | 8 +-
.../dht/GridDhtAffinityAssignmentRequest.java | 4 +-
.../dht/GridDhtAffinityAssignmentResponse.java | 8 +-
.../distributed/dht/GridDhtLockRequest.java | 28 +++---
.../distributed/dht/GridDhtLockResponse.java | 4 +-
.../distributed/dht/GridDhtTxFinishRequest.java | 36 ++++----
.../dht/GridDhtTxFinishResponse.java | 4 +-
.../dht/GridDhtTxPrepareRequest.java | 44 +++++-----
.../dht/GridDhtTxPrepareResponse.java | 8 +-
.../dht/atomic/GridDhtAtomicUpdateRequest.java | 44 +++++-----
.../dht/atomic/GridDhtAtomicUpdateResponse.java | 12 +--
.../dht/atomic/GridNearAtomicUpdateRequest.java | 56 ++++++------
.../atomic/GridNearAtomicUpdateResponse.java | 28 +++---
.../dht/preloader/GridDhtForceKeysRequest.java | 12 +--
.../dht/preloader/GridDhtForceKeysResponse.java | 12 +--
.../GridDhtPartitionDemandMessage.java | 20 ++---
.../GridDhtPartitionSupplyMessage.java | 16 ++--
.../GridDhtPartitionsAbstractMessage.java | 8 +-
.../preloader/GridDhtPartitionsFullMessage.java | 12 +--
.../GridDhtPartitionsSingleMessage.java | 4 +-
.../distributed/near/GridNearGetRequest.java | 28 +++---
.../distributed/near/GridNearGetResponse.java | 24 +++---
.../distributed/near/GridNearLockRequest.java | 32 +++----
.../distributed/near/GridNearLockResponse.java | 8 +-
.../near/GridNearTxFinishRequest.java | 20 ++---
.../near/GridNearTxFinishResponse.java | 12 +--
.../near/GridNearTxPrepareRequest.java | 29 ++++---
.../near/GridNearTxPrepareResponse.java | 12 +--
.../cache/query/GridCacheQueryRequest.java | 76 ++++++++---------
.../cache/query/GridCacheQueryResponse.java | 16 ++--
.../clock/GridClockDeltaSnapshotMessage.java | 6 +-
.../continuous/GridContinuousMessage.java | 18 ++--
.../dataload/GridDataLoadRequest.java | 46 +++++-----
.../dataload/GridDataLoadResponse.java | 12 +--
.../processors/ggfs/GridGgfsAckMessage.java | 12 +--
.../processors/ggfs/GridGgfsBlockKey.java | 16 ++--
.../processors/ggfs/GridGgfsBlocksMessage.java | 10 +--
.../processors/ggfs/GridGgfsDeleteMessage.java | 8 +-
.../ggfs/GridGgfsFileAffinityRange.java | 20 ++---
.../ggfs/GridGgfsFragmentizerRequest.java | 4 +-
.../ggfs/GridGgfsFragmentizerResponse.java | 4 +-
.../processors/ggfs/GridGgfsSyncMessage.java | 8 +-
.../GridClientHandshakeRequestWrapper.java | 14 +--
.../GridClientHandshakeResponseWrapper.java | 20 +++++
.../message/GridClientMessageWrapper.java | 56 ++++++------
.../message/GridClientPingPacketWrapper.java | 17 +++-
.../handlers/task/GridTaskResultRequest.java | 8 +-
.../handlers/task/GridTaskResultResponse.java | 16 ++--
.../tcp/GridMemcachedMessageWrapper.java | 19 ++++-
.../streamer/GridStreamerCancelRequest.java | 4 +-
.../streamer/GridStreamerExecutionRequest.java | 26 +++---
.../streamer/GridStreamerResponse.java | 8 +-
.../GridTcpCommunicationMessageState.java | 27 ++++++
82 files changed, 852 insertions(+), 776 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5b3f26e/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingRequest.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingRequest.java
index 0c4e968..a6c3346 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingRequest.java
@@ -69,15 +69,15 @@ public class JobStealingRequest extends GridTcpCommunicationMessageAdapter {
commState.setBuffer(buf);
if (!commState.typeWritten) {
-// if (!commState.writeByte(directType()))
-// return false;
-//
-// commState.typeWritten = true;
+ if (!commState.putByte(null, directType()))
+ return false;
+
+ commState.typeWritten = true;
}
switch (commState.idx) {
case 0:
- if (!commState.putInt(null, delta))
+ if (!commState.putInt("delta", delta))
return false;
commState.idx++;
@@ -97,7 +97,7 @@ public class JobStealingRequest extends GridTcpCommunicationMessageAdapter {
if (buf.remaining() < 4)
return false;
- delta = commState.getInt(null);
+ delta = commState.getInt("delta");
commState.idx++;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5b3f26e/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobCancelRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobCancelRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobCancelRequest.java
index 1c0e1a4..00fc2e5 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobCancelRequest.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobCancelRequest.java
@@ -134,19 +134,19 @@ public class GridJobCancelRequest extends GridTcpCommunicationMessageAdapter {
switch (commState.idx) {
case 0:
- if (!commState.putGridUuid(null, jobId))
+ if (!commState.putGridUuid("jobId", jobId))
return false;
commState.idx++;
case 1:
- if (!commState.putGridUuid(null, sesId))
+ if (!commState.putGridUuid("sesId", sesId))
return false;
commState.idx++;
case 2:
- if (!commState.putBoolean(null, sys))
+ if (!commState.putBoolean("sys", sys))
return false;
commState.idx++;
@@ -163,7 +163,7 @@ public class GridJobCancelRequest extends GridTcpCommunicationMessageAdapter {
switch (commState.idx) {
case 0:
- IgniteUuid jobId0 = commState.getGridUuid(null);
+ IgniteUuid jobId0 = commState.getGridUuid("jobId");
if (jobId0 == GRID_UUID_NOT_READ)
return false;
@@ -173,7 +173,7 @@ public class GridJobCancelRequest extends GridTcpCommunicationMessageAdapter {
commState.idx++;
case 1:
- IgniteUuid sesId0 = commState.getGridUuid(null);
+ IgniteUuid sesId0 = commState.getGridUuid("sesId");
if (sesId0 == GRID_UUID_NOT_READ)
return false;
@@ -186,7 +186,7 @@ public class GridJobCancelRequest extends GridTcpCommunicationMessageAdapter {
if (buf.remaining() < 1)
return false;
- sys = commState.getBoolean(null);
+ sys = commState.getBoolean("sys");
commState.idx++;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5b3f26e/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobExecuteRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobExecuteRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobExecuteRequest.java
index 2e3eba7..c7e3bcc 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobExecuteRequest.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobExecuteRequest.java
@@ -432,8 +432,8 @@ public class GridJobExecuteRequest extends GridTcpCommunicationMessageAdapter im
_clone.cpSpi = cpSpi;
_clone.siblings = siblings;
_clone.siblingsBytes = siblingsBytes;
- _clone.createTime = createTime;
_clone.createTime0 = createTime0;
+ _clone.createTime = createTime;
_clone.clsLdrId = clsLdrId;
_clone.depMode = depMode;
_clone.dynamicSiblings = dynamicSiblings;
@@ -457,61 +457,61 @@ public class GridJobExecuteRequest extends GridTcpCommunicationMessageAdapter im
switch (commState.idx) {
case 0:
- if (!commState.putGridUuid(null, clsLdrId))
+ if (!commState.putGridUuid("clsLdrId", clsLdrId))
return false;
commState.idx++;
case 1:
- if (!commState.putString(null, cpSpi))
+ if (!commState.putString("cpSpi", cpSpi))
return false;
commState.idx++;
case 2:
- if (!commState.putLong(null, createTime))
+ if (!commState.putLong("createTime", createTime))
return false;
commState.idx++;
case 3:
- if (!commState.putEnum(null, depMode))
+ if (!commState.putEnum("depMode", depMode))
return false;
commState.idx++;
case 4:
- if (!commState.putBoolean(null, dynamicSiblings))
+ if (!commState.putBoolean("dynamicSiblings", dynamicSiblings))
return false;
commState.idx++;
case 5:
- if (!commState.putBoolean(null, forceLocDep))
+ if (!commState.putBoolean("forceLocDep", forceLocDep))
return false;
commState.idx++;
case 6:
- if (!commState.putBoolean(null, internal))
+ if (!commState.putBoolean("internal", internal))
return false;
commState.idx++;
case 7:
- if (!commState.putByteArray(null, jobAttrsBytes))
+ if (!commState.putByteArray("jobAttrsBytes", jobAttrsBytes))
return false;
commState.idx++;
case 8:
- if (!commState.putByteArray(null, jobBytes))
+ if (!commState.putByteArray("jobBytes", jobBytes))
return false;
commState.idx++;
case 9:
- if (!commState.putGridUuid(null, jobId))
+ if (!commState.putGridUuid("jobId", jobId))
return false;
commState.idx++;
@@ -555,49 +555,49 @@ public class GridJobExecuteRequest extends GridTcpCommunicationMessageAdapter im
commState.idx++;
case 11:
- if (!commState.putByteArray(null, sesAttrsBytes))
+ if (!commState.putByteArray("sesAttrsBytes", sesAttrsBytes))
return false;
commState.idx++;
case 12:
- if (!commState.putBoolean(null, sesFullSup))
+ if (!commState.putBoolean("sesFullSup", sesFullSup))
return false;
commState.idx++;
case 13:
- if (!commState.putGridUuid(null, sesId))
+ if (!commState.putGridUuid("sesId", sesId))
return false;
commState.idx++;
case 14:
- if (!commState.putByteArray(null, siblingsBytes))
+ if (!commState.putByteArray("siblingsBytes", siblingsBytes))
return false;
commState.idx++;
case 15:
- if (!commState.putLong(null, startTaskTime))
+ if (!commState.putLong("startTaskTime", startTaskTime))
return false;
commState.idx++;
case 16:
- if (!commState.putString(null, taskClsName))
+ if (!commState.putString("taskClsName", taskClsName))
return false;
commState.idx++;
case 17:
- if (!commState.putString(null, taskName))
+ if (!commState.putString("taskName", taskName))
return false;
commState.idx++;
case 18:
- if (!commState.putLong(null, timeout))
+ if (!commState.putLong("timeout", timeout))
return false;
commState.idx++;
@@ -630,7 +630,7 @@ public class GridJobExecuteRequest extends GridTcpCommunicationMessageAdapter im
commState.idx++;
case 20:
- if (!commState.putString(null, userVer))
+ if (!commState.putString("userVer", userVer))
return false;
commState.idx++;
@@ -647,7 +647,7 @@ public class GridJobExecuteRequest extends GridTcpCommunicationMessageAdapter im
switch (commState.idx) {
case 0:
- IgniteUuid clsLdrId0 = commState.getGridUuid(null);
+ IgniteUuid clsLdrId0 = commState.getGridUuid("clsLdrId");
if (clsLdrId0 == GRID_UUID_NOT_READ)
return false;
@@ -657,7 +657,7 @@ public class GridJobExecuteRequest extends GridTcpCommunicationMessageAdapter im
commState.idx++;
case 1:
- String cpSpi0 = commState.getString(null);
+ String cpSpi0 = commState.getString("cpSpi");
if (cpSpi0 == STR_NOT_READ)
return false;
@@ -670,7 +670,7 @@ public class GridJobExecuteRequest extends GridTcpCommunicationMessageAdapter im
if (buf.remaining() < 8)
return false;
- createTime = commState.getLong(null);
+ createTime = commState.getLong("createTime");
commState.idx++;
@@ -678,7 +678,7 @@ public class GridJobExecuteRequest extends GridTcpCommunicationMessageAdapter im
if (buf.remaining() < 1)
return false;
- byte depMode0 = commState.getByte(null);
+ byte depMode0 = commState.getByte("depMode");
depMode = IgniteDeploymentMode.fromOrdinal(depMode0);
@@ -688,7 +688,7 @@ public class GridJobExecuteRequest extends GridTcpCommunicationMessageAdapter im
if (buf.remaining() < 1)
return false;
- dynamicSiblings = commState.getBoolean(null);
+ dynamicSiblings = commState.getBoolean("dynamicSiblings");
commState.idx++;
@@ -696,7 +696,7 @@ public class GridJobExecuteRequest extends GridTcpCommunicationMessageAdapter im
if (buf.remaining() < 1)
return false;
- forceLocDep = commState.getBoolean(null);
+ forceLocDep = commState.getBoolean("forceLocDep");
commState.idx++;
@@ -704,12 +704,12 @@ public class GridJobExecuteRequest extends GridTcpCommunicationMessageAdapter im
if (buf.remaining() < 1)
return false;
- internal = commState.getBoolean(null);
+ internal = commState.getBoolean("internal");
commState.idx++;
case 7:
- byte[] jobAttrsBytes0 = commState.getByteArray(null);
+ byte[] jobAttrsBytes0 = commState.getByteArray("jobAttrsBytes");
if (jobAttrsBytes0 == BYTE_ARR_NOT_READ)
return false;
@@ -719,7 +719,7 @@ public class GridJobExecuteRequest extends GridTcpCommunicationMessageAdapter im
commState.idx++;
case 8:
- byte[] jobBytes0 = commState.getByteArray(null);
+ byte[] jobBytes0 = commState.getByteArray("jobBytes");
if (jobBytes0 == BYTE_ARR_NOT_READ)
return false;
@@ -729,7 +729,7 @@ public class GridJobExecuteRequest extends GridTcpCommunicationMessageAdapter im
commState.idx++;
case 9:
- IgniteUuid jobId0 = commState.getGridUuid(null);
+ IgniteUuid jobId0 = commState.getGridUuid("jobId");
if (jobId0 == GRID_UUID_NOT_READ)
return false;
@@ -748,7 +748,7 @@ public class GridJobExecuteRequest extends GridTcpCommunicationMessageAdapter im
if (commState.readSize >= 0) {
if (ldrParticipants == null)
- ldrParticipants = U.newHashMap(commState.readSize);
+ ldrParticipants = new HashMap<>(commState.readSize, 1.0f);
for (int i = commState.readItems; i < commState.readSize; i++) {
if (!commState.keyDone) {
@@ -781,7 +781,7 @@ public class GridJobExecuteRequest extends GridTcpCommunicationMessageAdapter im
commState.idx++;
case 11:
- byte[] sesAttrsBytes0 = commState.getByteArray(null);
+ byte[] sesAttrsBytes0 = commState.getByteArray("sesAttrsBytes");
if (sesAttrsBytes0 == BYTE_ARR_NOT_READ)
return false;
@@ -794,12 +794,12 @@ public class GridJobExecuteRequest extends GridTcpCommunicationMessageAdapter im
if (buf.remaining() < 1)
return false;
- sesFullSup = commState.getBoolean(null);
+ sesFullSup = commState.getBoolean("sesFullSup");
commState.idx++;
case 13:
- IgniteUuid sesId0 = commState.getGridUuid(null);
+ IgniteUuid sesId0 = commState.getGridUuid("sesId");
if (sesId0 == GRID_UUID_NOT_READ)
return false;
@@ -809,7 +809,7 @@ public class GridJobExecuteRequest extends GridTcpCommunicationMessageAdapter im
commState.idx++;
case 14:
- byte[] siblingsBytes0 = commState.getByteArray(null);
+ byte[] siblingsBytes0 = commState.getByteArray("siblingsBytes");
if (siblingsBytes0 == BYTE_ARR_NOT_READ)
return false;
@@ -822,12 +822,12 @@ public class GridJobExecuteRequest extends GridTcpCommunicationMessageAdapter im
if (buf.remaining() < 8)
return false;
- startTaskTime = commState.getLong(null);
+ startTaskTime = commState.getLong("startTaskTime");
commState.idx++;
case 16:
- String taskClsName0 = commState.getString(null);
+ String taskClsName0 = commState.getString("taskClsName");
if (taskClsName0 == STR_NOT_READ)
return false;
@@ -837,7 +837,7 @@ public class GridJobExecuteRequest extends GridTcpCommunicationMessageAdapter im
commState.idx++;
case 17:
- String taskName0 = commState.getString(null);
+ String taskName0 = commState.getString("taskName");
if (taskName0 == STR_NOT_READ)
return false;
@@ -850,7 +850,7 @@ public class GridJobExecuteRequest extends GridTcpCommunicationMessageAdapter im
if (buf.remaining() < 8)
return false;
- timeout = commState.getLong(null);
+ timeout = commState.getLong("timeout");
commState.idx++;
@@ -884,7 +884,7 @@ public class GridJobExecuteRequest extends GridTcpCommunicationMessageAdapter im
commState.idx++;
case 20:
- String userVer0 = commState.getString(null);
+ String userVer0 = commState.getString("userVer");
if (userVer0 == STR_NOT_READ)
return false;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5b3f26e/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobExecuteRequestV2.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobExecuteRequestV2.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobExecuteRequestV2.java
index cf70842..9e3e583 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobExecuteRequestV2.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobExecuteRequestV2.java
@@ -137,7 +137,7 @@ public class GridJobExecuteRequestV2 extends GridJobExecuteRequest {
switch (commState.idx) {
case 21:
- if (!commState.putUuid(null, subjId))
+ if (!commState.putUuid("subjId", subjId))
return false;
commState.idx++;
@@ -156,7 +156,7 @@ public class GridJobExecuteRequestV2 extends GridJobExecuteRequest {
switch (commState.idx) {
case 21:
- UUID subjId0 = commState.getUuid(null);
+ UUID subjId0 = commState.getUuid("subjId");
if (subjId0 == UUID_NOT_READ)
return false;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5b3f26e/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobExecuteResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobExecuteResponse.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobExecuteResponse.java
index 88e7483..2ef82d8 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobExecuteResponse.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobExecuteResponse.java
@@ -229,43 +229,43 @@ public class GridJobExecuteResponse extends GridTcpCommunicationMessageAdapter i
switch (commState.idx) {
case 0:
- if (!commState.putByteArray(null, gridExBytes))
+ if (!commState.putByteArray("gridExBytes", gridExBytes))
return false;
commState.idx++;
case 1:
- if (!commState.putBoolean(null, isCancelled))
+ if (!commState.putBoolean("isCancelled", isCancelled))
return false;
commState.idx++;
case 2:
- if (!commState.putByteArray(null, jobAttrsBytes))
+ if (!commState.putByteArray("jobAttrsBytes", jobAttrsBytes))
return false;
commState.idx++;
case 3:
- if (!commState.putGridUuid(null, jobId))
+ if (!commState.putGridUuid("jobId", jobId))
return false;
commState.idx++;
case 4:
- if (!commState.putUuid(null, nodeId))
+ if (!commState.putUuid("nodeId", nodeId))
return false;
commState.idx++;
case 5:
- if (!commState.putByteArray(null, resBytes))
+ if (!commState.putByteArray("resBytes", resBytes))
return false;
commState.idx++;
case 6:
- if (!commState.putGridUuid(null, sesId))
+ if (!commState.putGridUuid("sesId", sesId))
return false;
commState.idx++;
@@ -282,7 +282,7 @@ public class GridJobExecuteResponse extends GridTcpCommunicationMessageAdapter i
switch (commState.idx) {
case 0:
- byte[] gridExBytes0 = commState.getByteArray(null);
+ byte[] gridExBytes0 = commState.getByteArray("gridExBytes");
if (gridExBytes0 == BYTE_ARR_NOT_READ)
return false;
@@ -295,12 +295,12 @@ public class GridJobExecuteResponse extends GridTcpCommunicationMessageAdapter i
if (buf.remaining() < 1)
return false;
- isCancelled = commState.getBoolean(null);
+ isCancelled = commState.getBoolean("isCancelled");
commState.idx++;
case 2:
- byte[] jobAttrsBytes0 = commState.getByteArray(null);
+ byte[] jobAttrsBytes0 = commState.getByteArray("jobAttrsBytes");
if (jobAttrsBytes0 == BYTE_ARR_NOT_READ)
return false;
@@ -310,7 +310,7 @@ public class GridJobExecuteResponse extends GridTcpCommunicationMessageAdapter i
commState.idx++;
case 3:
- IgniteUuid jobId0 = commState.getGridUuid(null);
+ IgniteUuid jobId0 = commState.getGridUuid("jobId");
if (jobId0 == GRID_UUID_NOT_READ)
return false;
@@ -320,7 +320,7 @@ public class GridJobExecuteResponse extends GridTcpCommunicationMessageAdapter i
commState.idx++;
case 4:
- UUID nodeId0 = commState.getUuid(null);
+ UUID nodeId0 = commState.getUuid("nodeId");
if (nodeId0 == UUID_NOT_READ)
return false;
@@ -330,7 +330,7 @@ public class GridJobExecuteResponse extends GridTcpCommunicationMessageAdapter i
commState.idx++;
case 5:
- byte[] resBytes0 = commState.getByteArray(null);
+ byte[] resBytes0 = commState.getByteArray("resBytes");
if (resBytes0 == BYTE_ARR_NOT_READ)
return false;
@@ -340,7 +340,7 @@ public class GridJobExecuteResponse extends GridTcpCommunicationMessageAdapter i
commState.idx++;
case 6:
- IgniteUuid sesId0 = commState.getGridUuid(null);
+ IgniteUuid sesId0 = commState.getGridUuid("sesId");
if (sesId0 == GRID_UUID_NOT_READ)
return false;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5b3f26e/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobSiblingsRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobSiblingsRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobSiblingsRequest.java
index a852d23..31bf8e0 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobSiblingsRequest.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobSiblingsRequest.java
@@ -108,13 +108,13 @@ public class GridJobSiblingsRequest extends GridTcpCommunicationMessageAdapter {
switch (commState.idx) {
case 0:
- if (!commState.putGridUuid(null, sesId))
+ if (!commState.putGridUuid("sesId", sesId))
return false;
commState.idx++;
case 1:
- if (!commState.putByteArray(null, topicBytes))
+ if (!commState.putByteArray("topicBytes", topicBytes))
return false;
commState.idx++;
@@ -131,7 +131,7 @@ public class GridJobSiblingsRequest extends GridTcpCommunicationMessageAdapter {
switch (commState.idx) {
case 0:
- IgniteUuid sesId0 = commState.getGridUuid(null);
+ IgniteUuid sesId0 = commState.getGridUuid("sesId");
if (sesId0 == GRID_UUID_NOT_READ)
return false;
@@ -141,7 +141,7 @@ public class GridJobSiblingsRequest extends GridTcpCommunicationMessageAdapter {
commState.idx++;
case 1:
- byte[] topicBytes0 = commState.getByteArray(null);
+ byte[] topicBytes0 = commState.getByteArray("topicBytes");
if (topicBytes0 == BYTE_ARR_NOT_READ)
return false;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5b3f26e/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobSiblingsResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobSiblingsResponse.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobSiblingsResponse.java
index 55e17f5..81821b1 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobSiblingsResponse.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobSiblingsResponse.java
@@ -100,7 +100,7 @@ public class GridJobSiblingsResponse extends GridTcpCommunicationMessageAdapter
switch (commState.idx) {
case 0:
- if (!commState.putByteArray(null, siblingsBytes))
+ if (!commState.putByteArray("siblingsBytes", siblingsBytes))
return false;
commState.idx++;
@@ -117,7 +117,7 @@ public class GridJobSiblingsResponse extends GridTcpCommunicationMessageAdapter
switch (commState.idx) {
case 0:
- byte[] siblingsBytes0 = commState.getByteArray(null);
+ byte[] siblingsBytes0 = commState.getByteArray("siblingsBytes");
if (siblingsBytes0 == BYTE_ARR_NOT_READ)
return false;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5b3f26e/modules/core/src/main/java/org/gridgain/grid/kernal/GridTaskCancelRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridTaskCancelRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridTaskCancelRequest.java
index 15ae1ad..d1ae101 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridTaskCancelRequest.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridTaskCancelRequest.java
@@ -83,7 +83,7 @@ public class GridTaskCancelRequest extends GridTcpCommunicationMessageAdapter {
switch (commState.idx) {
case 0:
- if (!commState.putGridUuid(null, sesId))
+ if (!commState.putGridUuid("sesId", sesId))
return false;
commState.idx++;
@@ -100,7 +100,7 @@ public class GridTaskCancelRequest extends GridTcpCommunicationMessageAdapter {
switch (commState.idx) {
case 0:
- IgniteUuid sesId0 = commState.getGridUuid(null);
+ IgniteUuid sesId0 = commState.getGridUuid("sesId");
if (sesId0 == GRID_UUID_NOT_READ)
return false;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5b3f26e/modules/core/src/main/java/org/gridgain/grid/kernal/GridTaskSessionRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridTaskSessionRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridTaskSessionRequest.java
index 86457da..8c9c63e 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridTaskSessionRequest.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridTaskSessionRequest.java
@@ -123,19 +123,19 @@ public class GridTaskSessionRequest extends GridTcpCommunicationMessageAdapter i
switch (commState.idx) {
case 0:
- if (!commState.putByteArray(null, attrsBytes))
+ if (!commState.putByteArray("attrsBytes", attrsBytes))
return false;
commState.idx++;
case 1:
- if (!commState.putGridUuid(null, jobId))
+ if (!commState.putGridUuid("jobId", jobId))
return false;
commState.idx++;
case 2:
- if (!commState.putGridUuid(null, sesId))
+ if (!commState.putGridUuid("sesId", sesId))
return false;
commState.idx++;
@@ -152,7 +152,7 @@ public class GridTaskSessionRequest extends GridTcpCommunicationMessageAdapter i
switch (commState.idx) {
case 0:
- byte[] attrsBytes0 = commState.getByteArray(null);
+ byte[] attrsBytes0 = commState.getByteArray("attrsBytes");
if (attrsBytes0 == BYTE_ARR_NOT_READ)
return false;
@@ -162,7 +162,7 @@ public class GridTaskSessionRequest extends GridTcpCommunicationMessageAdapter i
commState.idx++;
case 1:
- IgniteUuid jobId0 = commState.getGridUuid(null);
+ IgniteUuid jobId0 = commState.getGridUuid("jobId");
if (jobId0 == GRID_UUID_NOT_READ)
return false;
@@ -172,7 +172,7 @@ public class GridTaskSessionRequest extends GridTcpCommunicationMessageAdapter i
commState.idx++;
case 2:
- IgniteUuid sesId0 = commState.getGridUuid(null);
+ IgniteUuid sesId0 = commState.getGridUuid("sesId");
if (sesId0 == GRID_UUID_NOT_READ)
return false;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5b3f26e/modules/core/src/main/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointRequest.java
index c7ca93c..8932cc3 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointRequest.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointRequest.java
@@ -108,19 +108,19 @@ public class GridCheckpointRequest extends GridTcpCommunicationMessageAdapter {
switch (commState.idx) {
case 0:
- if (!commState.putString(null, cpSpi))
+ if (!commState.putString("cpSpi", cpSpi))
return false;
commState.idx++;
case 1:
- if (!commState.putString(null, key))
+ if (!commState.putString("key", key))
return false;
commState.idx++;
case 2:
- if (!commState.putGridUuid(null, sesId))
+ if (!commState.putGridUuid("sesId", sesId))
return false;
commState.idx++;
@@ -137,7 +137,7 @@ public class GridCheckpointRequest extends GridTcpCommunicationMessageAdapter {
switch (commState.idx) {
case 0:
- String cpSpi0 = commState.getString(null);
+ String cpSpi0 = commState.getString("cpSpi");
if (cpSpi0 == STR_NOT_READ)
return false;
@@ -147,7 +147,7 @@ public class GridCheckpointRequest extends GridTcpCommunicationMessageAdapter {
commState.idx++;
case 1:
- String key0 = commState.getString(null);
+ String key0 = commState.getString("key");
if (key0 == STR_NOT_READ)
return false;
@@ -157,7 +157,7 @@ public class GridCheckpointRequest extends GridTcpCommunicationMessageAdapter {
commState.idx++;
case 2:
- IgniteUuid sesId0 = commState.getGridUuid(null);
+ IgniteUuid sesId0 = commState.getGridUuid("sesId");
if (sesId0 == GRID_UUID_NOT_READ)
return false;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5b3f26e/modules/core/src/main/java/org/gridgain/grid/kernal/managers/communication/GridIoMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/communication/GridIoMessage.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/communication/GridIoMessage.java
index d9c11a5..098f52a 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/communication/GridIoMessage.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/communication/GridIoMessage.java
@@ -222,43 +222,43 @@ public class GridIoMessage extends GridTcpCommunicationMessageAdapter {
switch (commState.idx) {
case 0:
- if (!commState.putMessage(null, msg))
+ if (!commState.putMessage("msg", msg))
return false;
commState.idx++;
case 1:
- if (!commState.putLong(null, msgId))
+ if (!commState.putLong("msgId", msgId))
return false;
commState.idx++;
case 2:
- if (!commState.putEnum(null, plc))
+ if (!commState.putEnum("plc", plc))
return false;
commState.idx++;
case 3:
- if (!commState.putBoolean(null, skipOnTimeout))
+ if (!commState.putBoolean("skipOnTimeout", skipOnTimeout))
return false;
commState.idx++;
case 4:
- if (!commState.putLong(null, timeout))
+ if (!commState.putLong("timeout", timeout))
return false;
commState.idx++;
case 5:
- if (!commState.putByteArray(null, topicBytes))
+ if (!commState.putByteArray("topicBytes", topicBytes))
return false;
commState.idx++;
case 6:
- if (!commState.putInt(null, topicOrd))
+ if (!commState.putInt("topicOrd", topicOrd))
return false;
commState.idx++;
@@ -275,7 +275,7 @@ public class GridIoMessage extends GridTcpCommunicationMessageAdapter {
switch (commState.idx) {
case 0:
- Object msg0 = commState.getMessage(null);
+ Object msg0 = commState.getMessage("msg");
if (msg0 == MSG_NOT_READ)
return false;
@@ -288,7 +288,7 @@ public class GridIoMessage extends GridTcpCommunicationMessageAdapter {
if (buf.remaining() < 8)
return false;
- msgId = commState.getLong(null);
+ msgId = commState.getLong("msgId");
commState.idx++;
@@ -296,7 +296,7 @@ public class GridIoMessage extends GridTcpCommunicationMessageAdapter {
if (buf.remaining() < 1)
return false;
- byte plc0 = commState.getByte(null);
+ byte plc0 = commState.getByte("plc");
plc = GridIoPolicy.fromOrdinal(plc0);
@@ -306,7 +306,7 @@ public class GridIoMessage extends GridTcpCommunicationMessageAdapter {
if (buf.remaining() < 1)
return false;
- skipOnTimeout = commState.getBoolean(null);
+ skipOnTimeout = commState.getBoolean("skipOnTimeout");
commState.idx++;
@@ -314,12 +314,12 @@ public class GridIoMessage extends GridTcpCommunicationMessageAdapter {
if (buf.remaining() < 8)
return false;
- timeout = commState.getLong(null);
+ timeout = commState.getLong("timeout");
commState.idx++;
case 5:
- byte[] topicBytes0 = commState.getByteArray(null);
+ byte[] topicBytes0 = commState.getByteArray("topicBytes");
if (topicBytes0 == BYTE_ARR_NOT_READ)
return false;
@@ -332,7 +332,7 @@ public class GridIoMessage extends GridTcpCommunicationMessageAdapter {
if (buf.remaining() < 4)
return false;
- topicOrd = commState.getInt(null);
+ topicOrd = commState.getInt("topicOrd");
commState.idx++;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5b3f26e/modules/core/src/main/java/org/gridgain/grid/kernal/managers/communication/GridIoUserMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/communication/GridIoUserMessage.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/communication/GridIoUserMessage.java
index 2859016..3c5c459 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/communication/GridIoUserMessage.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/communication/GridIoUserMessage.java
@@ -234,25 +234,25 @@ public class GridIoUserMessage extends GridTcpCommunicationMessageAdapter {
switch (commState.idx) {
case 0:
- if (!commState.putByteArray(null, bodyBytes))
+ if (!commState.putByteArray("bodyBytes", bodyBytes))
return false;
commState.idx++;
case 1:
- if (!commState.putGridUuid(null, clsLdrId))
+ if (!commState.putGridUuid("clsLdrId", clsLdrId))
return false;
commState.idx++;
case 2:
- if (!commState.putString(null, depClsName))
+ if (!commState.putString("depClsName", depClsName))
return false;
commState.idx++;
case 3:
- if (!commState.putEnum(null, depMode))
+ if (!commState.putEnum("depMode", depMode))
return false;
commState.idx++;
@@ -296,13 +296,13 @@ public class GridIoUserMessage extends GridTcpCommunicationMessageAdapter {
commState.idx++;
case 5:
- if (!commState.putByteArray(null, topicBytes))
+ if (!commState.putByteArray("topicBytes", topicBytes))
return false;
commState.idx++;
case 6:
- if (!commState.putString(null, userVer))
+ if (!commState.putString("userVer", userVer))
return false;
commState.idx++;
@@ -319,7 +319,7 @@ public class GridIoUserMessage extends GridTcpCommunicationMessageAdapter {
switch (commState.idx) {
case 0:
- byte[] bodyBytes0 = commState.getByteArray(null);
+ byte[] bodyBytes0 = commState.getByteArray("bodyBytes");
if (bodyBytes0 == BYTE_ARR_NOT_READ)
return false;
@@ -329,7 +329,7 @@ public class GridIoUserMessage extends GridTcpCommunicationMessageAdapter {
commState.idx++;
case 1:
- IgniteUuid clsLdrId0 = commState.getGridUuid(null);
+ IgniteUuid clsLdrId0 = commState.getGridUuid("clsLdrId");
if (clsLdrId0 == GRID_UUID_NOT_READ)
return false;
@@ -339,7 +339,7 @@ public class GridIoUserMessage extends GridTcpCommunicationMessageAdapter {
commState.idx++;
case 2:
- String depClsName0 = commState.getString(null);
+ String depClsName0 = commState.getString("depClsName");
if (depClsName0 == STR_NOT_READ)
return false;
@@ -352,7 +352,7 @@ public class GridIoUserMessage extends GridTcpCommunicationMessageAdapter {
if (buf.remaining() < 1)
return false;
- byte depMode0 = commState.getByte(null);
+ byte depMode0 = commState.getByte("depMode");
depMode = IgniteDeploymentMode.fromOrdinal(depMode0);
@@ -368,7 +368,7 @@ public class GridIoUserMessage extends GridTcpCommunicationMessageAdapter {
if (commState.readSize >= 0) {
if (ldrParties == null)
- ldrParties = U.newHashMap(commState.readSize);
+ ldrParties = new HashMap<>(commState.readSize, 1.0f);
for (int i = commState.readItems; i < commState.readSize; i++) {
if (!commState.keyDone) {
@@ -401,7 +401,7 @@ public class GridIoUserMessage extends GridTcpCommunicationMessageAdapter {
commState.idx++;
case 5:
- byte[] topicBytes0 = commState.getByteArray(null);
+ byte[] topicBytes0 = commState.getByteArray("topicBytes");
if (topicBytes0 == BYTE_ARR_NOT_READ)
return false;
@@ -411,7 +411,7 @@ public class GridIoUserMessage extends GridTcpCommunicationMessageAdapter {
commState.idx++;
case 6:
- String userVer0 = commState.getString(null);
+ String userVer0 = commState.getString("userVer");
if (userVer0 == STR_NOT_READ)
return false;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5b3f26e/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentInfoBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentInfoBean.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentInfoBean.java
index c294a8c..f9d1d85 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentInfoBean.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentInfoBean.java
@@ -164,19 +164,19 @@ public class GridDeploymentInfoBean extends GridTcpCommunicationMessageAdapter i
switch (commState.idx) {
case 0:
- if (!commState.putGridUuid(null, clsLdrId))
+ if (!commState.putGridUuid("clsLdrId", clsLdrId))
return false;
commState.idx++;
case 1:
- if (!commState.putEnum(null, depMode))
+ if (!commState.putEnum("depMode", depMode))
return false;
commState.idx++;
case 2:
- if (!commState.putBoolean(null, locDepOwner))
+ if (!commState.putBoolean("locDepOwner", locDepOwner))
return false;
commState.idx++;
@@ -220,7 +220,7 @@ public class GridDeploymentInfoBean extends GridTcpCommunicationMessageAdapter i
commState.idx++;
case 4:
- if (!commState.putString(null, userVer))
+ if (!commState.putString("userVer", userVer))
return false;
commState.idx++;
@@ -237,7 +237,7 @@ public class GridDeploymentInfoBean extends GridTcpCommunicationMessageAdapter i
switch (commState.idx) {
case 0:
- IgniteUuid clsLdrId0 = commState.getGridUuid(null);
+ IgniteUuid clsLdrId0 = commState.getGridUuid("clsLdrId");
if (clsLdrId0 == GRID_UUID_NOT_READ)
return false;
@@ -250,7 +250,7 @@ public class GridDeploymentInfoBean extends GridTcpCommunicationMessageAdapter i
if (buf.remaining() < 1)
return false;
- byte depMode0 = commState.getByte(null);
+ byte depMode0 = commState.getByte("depMode");
depMode = IgniteDeploymentMode.fromOrdinal(depMode0);
@@ -260,7 +260,7 @@ public class GridDeploymentInfoBean extends GridTcpCommunicationMessageAdapter i
if (buf.remaining() < 1)
return false;
- locDepOwner = commState.getBoolean(null);
+ locDepOwner = commState.getBoolean("locDepOwner");
commState.idx++;
@@ -274,7 +274,7 @@ public class GridDeploymentInfoBean extends GridTcpCommunicationMessageAdapter i
if (commState.readSize >= 0) {
if (participants == null)
- participants = U.newHashMap(commState.readSize);
+ participants = new HashMap<>(commState.readSize, 1.0f);
for (int i = commState.readItems; i < commState.readSize; i++) {
if (!commState.keyDone) {
@@ -307,7 +307,7 @@ public class GridDeploymentInfoBean extends GridTcpCommunicationMessageAdapter i
commState.idx++;
case 4:
- String userVer0 = commState.getString(null);
+ String userVer0 = commState.getString("userVer");
if (userVer0 == STR_NOT_READ)
return false;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5b3f26e/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentRequest.java
index ffcd805..3dcc483 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentRequest.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentRequest.java
@@ -183,13 +183,13 @@ public class GridDeploymentRequest extends GridTcpCommunicationMessageAdapter {
switch (commState.idx) {
case 0:
- if (!commState.putBoolean(null, isUndeploy))
+ if (!commState.putBoolean("isUndeploy", isUndeploy))
return false;
commState.idx++;
case 1:
- if (!commState.putGridUuid(null, ldrId))
+ if (!commState.putGridUuid("ldrId", ldrId))
return false;
commState.idx++;
@@ -222,13 +222,13 @@ public class GridDeploymentRequest extends GridTcpCommunicationMessageAdapter {
commState.idx++;
case 3:
- if (!commState.putByteArray(null, resTopicBytes))
+ if (!commState.putByteArray("resTopicBytes", resTopicBytes))
return false;
commState.idx++;
case 4:
- if (!commState.putString(null, rsrcName))
+ if (!commState.putString("rsrcName", rsrcName))
return false;
commState.idx++;
@@ -248,12 +248,12 @@ public class GridDeploymentRequest extends GridTcpCommunicationMessageAdapter {
if (buf.remaining() < 1)
return false;
- isUndeploy = commState.getBoolean(null);
+ isUndeploy = commState.getBoolean("isUndeploy");
commState.idx++;
case 1:
- IgniteUuid ldrId0 = commState.getGridUuid(null);
+ IgniteUuid ldrId0 = commState.getGridUuid("ldrId");
if (ldrId0 == GRID_UUID_NOT_READ)
return false;
@@ -292,7 +292,7 @@ public class GridDeploymentRequest extends GridTcpCommunicationMessageAdapter {
commState.idx++;
case 3:
- byte[] resTopicBytes0 = commState.getByteArray(null);
+ byte[] resTopicBytes0 = commState.getByteArray("resTopicBytes");
if (resTopicBytes0 == BYTE_ARR_NOT_READ)
return false;
@@ -302,7 +302,7 @@ public class GridDeploymentRequest extends GridTcpCommunicationMessageAdapter {
commState.idx++;
case 4:
- String rsrcName0 = commState.getString(null);
+ String rsrcName0 = commState.getString("rsrcName");
if (rsrcName0 == STR_NOT_READ)
return false;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5b3f26e/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentResponse.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentResponse.java
index 3d8e7ac..bf0a4b6 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentResponse.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentResponse.java
@@ -131,19 +131,19 @@ public class GridDeploymentResponse extends GridTcpCommunicationMessageAdapter {
switch (commState.idx) {
case 0:
- if (!commState.putByteArrayList(null, byteSrc))
+ if (!commState.putByteArrayList("byteSrc", byteSrc))
return false;
commState.idx++;
case 1:
- if (!commState.putString(null, errMsg))
+ if (!commState.putString("errMsg", errMsg))
return false;
commState.idx++;
case 2:
- if (!commState.putBoolean(null, success))
+ if (!commState.putBoolean("success", success))
return false;
commState.idx++;
@@ -160,7 +160,7 @@ public class GridDeploymentResponse extends GridTcpCommunicationMessageAdapter {
switch (commState.idx) {
case 0:
- GridByteArrayList byteSrc0 = commState.getByteArrayList(null);
+ GridByteArrayList byteSrc0 = commState.getByteArrayList("byteSrc");
if (byteSrc0 == BYTE_ARR_LIST_NOT_READ)
return false;
@@ -170,7 +170,7 @@ public class GridDeploymentResponse extends GridTcpCommunicationMessageAdapter {
commState.idx++;
case 1:
- String errMsg0 = commState.getString(null);
+ String errMsg0 = commState.getString("errMsg");
if (errMsg0 == STR_NOT_READ)
return false;
@@ -183,7 +183,7 @@ public class GridDeploymentResponse extends GridTcpCommunicationMessageAdapter {
if (buf.remaining() < 1)
return false;
- success = commState.getBoolean(null);
+ success = commState.getBoolean("success");
commState.idx++;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5b3f26e/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 f80707a..4b5543c 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
@@ -294,37 +294,37 @@ public class GridEventStorageMessage extends GridTcpCommunicationMessageAdapter
switch (commState.idx) {
case 0:
- if (!commState.putGridUuid(null, clsLdrId))
+ if (!commState.putGridUuid("clsLdrId", clsLdrId))
return false;
commState.idx++;
case 1:
- if (!commState.putEnum(null, depMode))
+ if (!commState.putEnum("depMode", depMode))
return false;
commState.idx++;
case 2:
- if (!commState.putByteArray(null, evtsBytes))
+ if (!commState.putByteArray("evtsBytes", evtsBytes))
return false;
commState.idx++;
case 3:
- if (!commState.putByteArray(null, exBytes))
+ if (!commState.putByteArray("exBytes", exBytes))
return false;
commState.idx++;
case 4:
- if (!commState.putByteArray(null, filter))
+ if (!commState.putByteArray("filter", filter))
return false;
commState.idx++;
case 5:
- if (!commState.putString(null, filterClsName))
+ if (!commState.putString("filterClsName", filterClsName))
return false;
commState.idx++;
@@ -368,13 +368,13 @@ public class GridEventStorageMessage extends GridTcpCommunicationMessageAdapter
commState.idx++;
case 7:
- if (!commState.putByteArray(null, resTopicBytes))
+ if (!commState.putByteArray("resTopicBytes", resTopicBytes))
return false;
commState.idx++;
case 8:
- if (!commState.putString(null, userVer))
+ if (!commState.putString("userVer", userVer))
return false;
commState.idx++;
@@ -391,7 +391,7 @@ public class GridEventStorageMessage extends GridTcpCommunicationMessageAdapter
switch (commState.idx) {
case 0:
- IgniteUuid clsLdrId0 = commState.getGridUuid(null);
+ IgniteUuid clsLdrId0 = commState.getGridUuid("clsLdrId");
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(null);
+ byte depMode0 = commState.getByte("depMode");
depMode = IgniteDeploymentMode.fromOrdinal(depMode0);
commState.idx++;
case 2:
- byte[] evtsBytes0 = commState.getByteArray(null);
+ byte[] evtsBytes0 = commState.getByteArray("evtsBytes");
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(null);
+ byte[] exBytes0 = commState.getByteArray("exBytes");
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(null);
+ byte[] filter0 = commState.getByteArray("filter");
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(null);
+ String filterClsName0 = commState.getString("filterClsName");
if (filterClsName0 == STR_NOT_READ)
return false;
@@ -460,7 +460,7 @@ public class GridEventStorageMessage extends GridTcpCommunicationMessageAdapter
if (commState.readSize >= 0) {
if (ldrParties == null)
- ldrParties = U.newHashMap(commState.readSize);
+ ldrParties = new HashMap<>(commState.readSize, 1.0f);
for (int i = commState.readItems; i < commState.readSize; i++) {
if (!commState.keyDone) {
@@ -493,7 +493,7 @@ public class GridEventStorageMessage extends GridTcpCommunicationMessageAdapter
commState.idx++;
case 7:
- byte[] resTopicBytes0 = commState.getByteArray(null);
+ byte[] resTopicBytes0 = commState.getByteArray("resTopicBytes");
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(null);
+ String userVer0 = commState.getString("userVer");
if (userVer0 == STR_NOT_READ)
return false;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5b3f26e/modules/core/src/main/java/org/gridgain/grid/kernal/processors/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 8a1f0b9..3c3bd83 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
@@ -169,19 +169,19 @@ public class GridCacheEvictionRequest<K, V> extends GridCacheMessage<K, V> imple
switch (commState.idx) {
case 3:
- if (!commState.putByteArray(null, entriesBytes))
+ if (!commState.putByteArray("entriesBytes", entriesBytes))
return false;
commState.idx++;
case 4:
- if (!commState.putLong(null, futId))
+ if (!commState.putLong("futId", futId))
return false;
commState.idx++;
case 5:
- if (!commState.putLong(null, topVer))
+ if (!commState.putLong("topVer", 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(null);
+ byte[] entriesBytes0 = commState.getByteArray("entriesBytes");
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(null);
+ futId = commState.getLong("futId");
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(null);
+ topVer = commState.getLong("topVer");
commState.idx++;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5b3f26e/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/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 203b99d..a14604a 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
@@ -159,13 +159,13 @@ public class GridCacheEvictionResponse<K, V> extends GridCacheMessage<K, V> {
switch (commState.idx) {
case 3:
- if (!commState.putBoolean(null, err))
+ if (!commState.putBoolean("err", err))
return false;
commState.idx++;
case 4:
- if (!commState.putLong(null, futId))
+ if (!commState.putLong("futId", futId))
return false;
commState.idx++;
@@ -215,7 +215,7 @@ public class GridCacheEvictionResponse<K, V> extends GridCacheMessage<K, V> {
if (buf.remaining() < 1)
return false;
- err = commState.getBoolean(null);
+ err = commState.getBoolean("err");
commState.idx++;
@@ -223,7 +223,7 @@ public class GridCacheEvictionResponse<K, V> extends GridCacheMessage<K, V> {
if (buf.remaining() < 8)
return false;
- futId = commState.getLong(null);
+ futId = commState.getLong("futId");
commState.idx++;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5b3f26e/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/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 ea7987d..8d6986b 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
@@ -594,19 +594,19 @@ public abstract class GridCacheMessage<K, V> extends GridTcpCommunicationMessage
switch (commState.idx) {
case 0:
- if (!commState.putInt(null, cacheId))
+ if (!commState.putInt("cacheId", cacheId))
return false;
commState.idx++;
case 1:
- if (!commState.putMessage(null, depInfo))
+ if (!commState.putMessage("depInfo", depInfo))
return false;
commState.idx++;
case 2:
- if (!commState.putLong(null, msgId))
+ if (!commState.putLong("msgId", 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(null);
+ cacheId = commState.getInt("cacheId");
commState.idx++;
case 1:
- Object depInfo0 = commState.getMessage(null);
+ Object depInfo0 = commState.getMessage("depInfo");
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(null);
+ msgId = commState.getLong("msgId");
commState.idx++;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5b3f26e/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/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 88c087f..93f8653 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
@@ -126,25 +126,25 @@ public class GridCacheOptimisticCheckPreparedTxRequest<K, V> extends GridDistrib
switch (commState.idx) {
case 8:
- if (!commState.putGridUuid(null, futId))
+ if (!commState.putGridUuid("futId", futId))
return false;
commState.idx++;
case 9:
- if (!commState.putGridUuid(null, miniId))
+ if (!commState.putGridUuid("miniId", miniId))
return false;
commState.idx++;
case 10:
- if (!commState.putCacheVersion(null, nearXidVer))
+ if (!commState.putCacheVersion("nearXidVer", nearXidVer))
return false;
commState.idx++;
case 11:
- if (!commState.putInt(null, txNum))
+ if (!commState.putInt("txNum", 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(null);
+ IgniteUuid futId0 = commState.getGridUuid("futId");
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(null);
+ IgniteUuid miniId0 = commState.getGridUuid("miniId");
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(null);
+ GridCacheVersion nearXidVer0 = commState.getCacheVersion("nearXidVer");
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(null);
+ txNum = commState.getInt("txNum");
commState.idx++;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5b3f26e/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/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 1baa17a..4bfda3d 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
@@ -114,19 +114,19 @@ public class GridCacheOptimisticCheckPreparedTxResponse<K, V> extends GridDistri
switch (commState.idx) {
case 8:
- if (!commState.putGridUuid(null, futId))
+ if (!commState.putGridUuid("futId", futId))
return false;
commState.idx++;
case 9:
- if (!commState.putGridUuid(null, miniId))
+ if (!commState.putGridUuid("miniId", miniId))
return false;
commState.idx++;
case 10:
- if (!commState.putBoolean(null, success))
+ if (!commState.putBoolean("success", 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(null);
+ IgniteUuid futId0 = commState.getGridUuid("futId");
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(null);
+ IgniteUuid miniId0 = commState.getGridUuid("miniId");
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(null);
+ success = commState.getBoolean("success");
commState.idx++;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5b3f26e/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/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 89b1a4b..f25317a 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
@@ -161,37 +161,37 @@ public class GridCachePessimisticCheckCommittedTxRequest<K, V> extends GridDistr
switch (commState.idx) {
case 8:
- if (!commState.putGridUuid(null, futId))
+ if (!commState.putGridUuid("futId", futId))
return false;
commState.idx++;
case 9:
- if (!commState.putGridUuid(null, miniId))
+ if (!commState.putGridUuid("miniId", miniId))
return false;
commState.idx++;
case 10:
- if (!commState.putCacheVersion(null, nearXidVer))
+ if (!commState.putCacheVersion("nearXidVer", nearXidVer))
return false;
commState.idx++;
case 11:
- if (!commState.putUuid(null, originatingNodeId))
+ if (!commState.putUuid("originatingNodeId", originatingNodeId))
return false;
commState.idx++;
case 12:
- if (!commState.putLong(null, originatingThreadId))
+ if (!commState.putLong("originatingThreadId", originatingThreadId))
return false;
commState.idx++;
case 13:
- if (!commState.putBoolean(null, nearOnlyCheck))
+ if (!commState.putBoolean("nearOnlyCheck", 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(null);
+ IgniteUuid futId0 = commState.getGridUuid("futId");
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(null);
+ IgniteUuid miniId0 = commState.getGridUuid("miniId");
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(null);
+ GridCacheVersion nearXidVer0 = commState.getCacheVersion("nearXidVer");
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(null);
+ UUID originatingNodeId0 = commState.getUuid("originatingNodeId");
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(null);
+ originatingThreadId = commState.getLong("originatingThreadId");
commState.idx++;
@@ -262,7 +262,7 @@ public class GridCachePessimisticCheckCommittedTxRequest<K, V> extends GridDistr
if (buf.remaining() < 1)
return false;
- nearOnlyCheck = commState.getBoolean(null);
+ nearOnlyCheck = commState.getBoolean("nearOnlyCheck");
commState.idx++;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5b3f26e/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/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 88f354b..19cfbb8 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
@@ -145,19 +145,19 @@ public class GridCachePessimisticCheckCommittedTxResponse<K, V> extends GridDist
switch (commState.idx) {
case 8:
- if (!commState.putByteArray(null, committedTxInfoBytes))
+ if (!commState.putByteArray("committedTxInfoBytes", committedTxInfoBytes))
return false;
commState.idx++;
case 9:
- if (!commState.putGridUuid(null, futId))
+ if (!commState.putGridUuid("futId", futId))
return false;
commState.idx++;
case 10:
- if (!commState.putGridUuid(null, miniId))
+ if (!commState.putGridUuid("miniId", 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(null);
+ byte[] committedTxInfoBytes0 = commState.getByteArray("committedTxInfoBytes");
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(null);
+ IgniteUuid futId0 = commState.getGridUuid("futId");
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(null);
+ IgniteUuid miniId0 = commState.getGridUuid("miniId");
if (miniId0 == GRID_UUID_NOT_READ)
return false;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5b3f26e/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/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 3a0a86f..3709cd9 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
@@ -263,13 +263,13 @@ public abstract class GridDistributedBaseMessage<K, V> extends GridCacheMessage<
switch (commState.idx) {
case 3:
- if (!commState.putByteArray(null, candsByIdxBytes))
+ if (!commState.putByteArray("candsByIdxBytes", candsByIdxBytes))
return false;
commState.idx++;
case 4:
- if (!commState.putByteArray(null, candsByKeyBytes))
+ if (!commState.putByteArray("candsByKeyBytes", candsByKeyBytes))
return false;
commState.idx++;
@@ -329,7 +329,7 @@ public abstract class GridDistributedBaseMessage<K, V> extends GridCacheMessage<
commState.idx++;
case 7:
- if (!commState.putCacheVersion(null, ver))
+ if (!commState.putCacheVersion("ver", 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(null);
+ byte[] candsByIdxBytes0 = commState.getByteArray("candsByIdxBytes");
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(null);
+ byte[] candsByKeyBytes0 = commState.getByteArray("candsByKeyBytes");
if (candsByKeyBytes0 == BYTE_ARR_NOT_READ)
return false;
@@ -427,7 +427,7 @@ public abstract class GridDistributedBaseMessage<K, V> extends GridCacheMessage<
commState.idx++;
case 7:
- GridCacheVersion ver0 = commState.getCacheVersion(null);
+ GridCacheVersion ver0 = commState.getCacheVersion("ver");
if (ver0 == CACHE_VER_NOT_READ)
return false;