# gg-9791 - Added MessageHeader
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8f0b647b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8f0b647b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8f0b647b Branch: refs/heads/ignite-312 Commit: 8f0b647b56f2a51f1874f83d8cafa90ebc0a8e24 Parents: 0303b40 Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Tue Feb 17 18:37:52 2015 -0800 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Tue Feb 17 18:37:53 2015 -0800 ---------------------------------------------------------------------- .../codegen/CommunicationMessageCodeGenerator.java | 17 +++++++++-------- .../ignite/internal/GridJobCancelRequest.java | 6 +++--- .../ignite/internal/GridJobExecuteRequest.java | 6 +++--- .../ignite/internal/GridJobExecuteResponse.java | 6 +++--- .../ignite/internal/GridJobSiblingsRequest.java | 6 +++--- .../ignite/internal/GridJobSiblingsResponse.java | 6 +++--- .../ignite/internal/GridTaskCancelRequest.java | 6 +++--- .../ignite/internal/GridTaskSessionRequest.java | 6 +++--- .../internal/direct/DirectMessageWriter.java | 4 ++-- .../managers/checkpoint/GridCheckpointRequest.java | 6 +++--- .../managers/communication/GridIoMessage.java | 6 +++--- .../managers/communication/GridIoUserMessage.java | 6 +++--- .../deployment/GridDeploymentInfoBean.java | 6 +++--- .../managers/deployment/GridDeploymentRequest.java | 6 +++--- .../deployment/GridDeploymentResponse.java | 6 +++--- .../eventstorage/GridEventStorageMessage.java | 6 +++--- .../processors/cache/GridCacheEvictionRequest.java | 6 +++--- .../cache/GridCacheEvictionResponse.java | 6 +++--- .../processors/cache/GridCacheMessage.java | 6 +++--- .../processors/cache/GridCacheValueBytes.java | 6 +++--- .../GridCacheOptimisticCheckPreparedTxRequest.java | 6 +++--- ...GridCacheOptimisticCheckPreparedTxResponse.java | 6 +++--- .../distributed/GridCacheTtlUpdateRequest.java | 6 +++--- .../distributed/GridDistributedBaseMessage.java | 6 +++--- .../distributed/GridDistributedLockRequest.java | 6 +++--- .../distributed/GridDistributedLockResponse.java | 6 +++--- .../GridDistributedTxFinishRequest.java | 6 +++--- .../GridDistributedTxFinishResponse.java | 6 +++--- .../GridDistributedTxPrepareRequest.java | 6 +++--- .../GridDistributedTxPrepareResponse.java | 6 +++--- .../distributed/GridDistributedUnlockRequest.java | 6 +++--- .../dht/GridDhtAffinityAssignmentRequest.java | 6 +++--- .../dht/GridDhtAffinityAssignmentResponse.java | 6 +++--- .../cache/distributed/dht/GridDhtLockRequest.java | 6 +++--- .../cache/distributed/dht/GridDhtLockResponse.java | 6 +++--- .../distributed/dht/GridDhtTxFinishRequest.java | 6 +++--- .../distributed/dht/GridDhtTxFinishResponse.java | 6 +++--- .../distributed/dht/GridDhtTxPrepareRequest.java | 6 +++--- .../distributed/dht/GridDhtTxPrepareResponse.java | 6 +++--- .../distributed/dht/GridDhtUnlockRequest.java | 6 +++--- .../GridDhtAtomicDeferredUpdateResponse.java | 6 +++--- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 6 +++--- .../dht/atomic/GridDhtAtomicUpdateResponse.java | 6 +++--- .../dht/atomic/GridNearAtomicUpdateRequest.java | 6 +++--- .../dht/atomic/GridNearAtomicUpdateResponse.java | 6 +++--- .../dht/preloader/GridDhtForceKeysRequest.java | 6 +++--- .../dht/preloader/GridDhtForceKeysResponse.java | 6 +++--- .../preloader/GridDhtPartitionDemandMessage.java | 6 +++--- .../dht/preloader/GridDhtPartitionExchangeId.java | 6 +++--- .../preloader/GridDhtPartitionSupplyMessage.java | 6 +++--- .../GridDhtPartitionsAbstractMessage.java | 6 +++--- .../preloader/GridDhtPartitionsFullMessage.java | 6 +++--- .../preloader/GridDhtPartitionsSingleMessage.java | 6 +++--- .../preloader/GridDhtPartitionsSingleRequest.java | 6 +++--- .../cache/distributed/near/GridNearGetRequest.java | 6 +++--- .../distributed/near/GridNearGetResponse.java | 6 +++--- .../distributed/near/GridNearLockRequest.java | 6 +++--- .../distributed/near/GridNearLockResponse.java | 6 +++--- .../distributed/near/GridNearTxFinishRequest.java | 6 +++--- .../distributed/near/GridNearTxFinishResponse.java | 6 +++--- .../distributed/near/GridNearTxPrepareRequest.java | 6 +++--- .../near/GridNearTxPrepareResponse.java | 6 +++--- .../distributed/near/GridNearUnlockRequest.java | 6 +++--- .../cache/query/GridCacheQueryRequest.java | 6 +++--- .../cache/query/GridCacheQueryResponse.java | 6 +++--- .../processors/cache/version/GridCacheVersion.java | 6 +++--- .../clock/GridClockDeltaSnapshotMessage.java | 6 +++--- .../processors/clock/GridClockDeltaVersion.java | 6 +++--- .../continuous/GridContinuousMessage.java | 6 +++--- .../processors/dataload/GridDataLoadRequest.java | 6 +++--- .../processors/dataload/GridDataLoadResponse.java | 6 +++--- .../internal/processors/igfs/IgfsAckMessage.java | 6 +++--- .../internal/processors/igfs/IgfsBlockKey.java | 6 +++--- .../processors/igfs/IgfsBlocksMessage.java | 6 +++--- .../processors/igfs/IgfsCommunicationMessage.java | 6 +++--- .../processors/igfs/IgfsDeleteMessage.java | 6 +++--- .../processors/igfs/IgfsFileAffinityRange.java | 6 +++--- .../processors/igfs/IgfsFragmentizerRequest.java | 6 +++--- .../processors/igfs/IgfsFragmentizerResponse.java | 6 +++--- .../internal/processors/igfs/IgfsSyncMessage.java | 6 +++--- .../rest/handlers/task/GridTaskResultRequest.java | 6 +++--- .../rest/handlers/task/GridTaskResultResponse.java | 6 +++--- .../streamer/GridStreamerCancelRequest.java | 6 +++--- .../streamer/GridStreamerExecutionRequest.java | 6 +++--- .../processors/streamer/GridStreamerResponse.java | 6 +++--- .../ignite/internal/util/GridByteArrayList.java | 6 +++--- .../apache/ignite/internal/util/GridLongList.java | 6 +++--- .../extensions/communication/MessageWriter.java | 8 ++++---- .../collision/jobstealing/JobStealingRequest.java | 6 +++--- .../ignite/spi/communication/GridTestMessage.java | 4 ++-- 90 files changed, 275 insertions(+), 274 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java ---------------------------------------------------------------------- diff --git a/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java b/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java index 91fdc1f..28b5002 100644 --- a/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java +++ b/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java @@ -291,17 +291,17 @@ public class CommunicationMessageCodeGenerator { Collections.sort(fields, FIELD_CMP); + int state = startState(cls); + indent = 2; boolean hasSuper = cls.getSuperclass() != BASE_CLS; - start(write, hasSuper ? "writeTo" : null, true); - start(read, hasSuper ? "readFrom" : null, false); + start(write, hasSuper ? "writeTo" : null, true, state + fields.size()); + start(read, hasSuper ? "readFrom" : null, false, 0); indent++; - int state = startState(cls); - for (Field field : fields) processField(field, state++); @@ -347,8 +347,9 @@ public class CommunicationMessageCodeGenerator { * @param code Code lines. * @param superMtd Super class method name. * @param write Whether write code is generated. + * @param fieldCnt Fields count. */ - private void start(Collection<String> code, @Nullable String superMtd, boolean write) { + private void start(Collection<String> code, @Nullable String superMtd, boolean write, int fieldCnt) { assert code != null; code.add(builder().a(write ? "writer" : "reader").a(".setBuffer(").a(BUF_VAR).a(");").toString()); @@ -364,14 +365,14 @@ public class CommunicationMessageCodeGenerator { } if (write) { - code.add(builder().a("if (!writer.isTypeWritten()) {").toString()); + code.add(builder().a("if (!writer.isHeaderWritten()) {").toString()); indent++; - returnFalseIfFailed(code, "writer.writeByte", "null", "directType()"); + returnFalseIfFailed(code, "writer.writeHeader", "new MessageHeader(directType(), (byte)" + fieldCnt + ")"); code.add(EMPTY); - code.add(builder().a("writer.onTypeWritten();").toString()); + code.add(builder().a("writer.onHeaderWritten();").toString()); indent--; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/GridJobCancelRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobCancelRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobCancelRequest.java index 4f9baff..69d857d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridJobCancelRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridJobCancelRequest.java @@ -113,11 +113,11 @@ public class GridJobCancelRequest extends MessageAdapter { @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { writer.setBuffer(buf); - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)3))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java index 4a961a2..78fc844 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java @@ -415,11 +415,11 @@ public class GridJobExecuteRequest extends MessageAdapter implements GridTaskMes @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { writer.setBuffer(buf); - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)21))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteResponse.java index fb0f72d..db7a642 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteResponse.java @@ -208,11 +208,11 @@ public class GridJobExecuteResponse extends MessageAdapter implements GridTaskMe @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { writer.setBuffer(buf); - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)7))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsRequest.java index 6ef7102..9d86e4a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsRequest.java @@ -87,11 +87,11 @@ public class GridJobSiblingsRequest extends MessageAdapter { @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { writer.setBuffer(buf); - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)2))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsResponse.java index 77032fc..86e1c80 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsResponse.java @@ -80,11 +80,11 @@ public class GridJobSiblingsResponse extends MessageAdapter { @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { writer.setBuffer(buf); - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)1))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskCancelRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskCancelRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskCancelRequest.java index 2501522..3045aed 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskCancelRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskCancelRequest.java @@ -64,11 +64,11 @@ public class GridTaskCancelRequest extends MessageAdapter { @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { writer.setBuffer(buf); - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)1))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionRequest.java index 214c2f1..d04b841 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionRequest.java @@ -101,11 +101,11 @@ public class GridTaskSessionRequest extends MessageAdapter implements GridTaskMe @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { writer.setBuffer(buf); - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)3))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java index d5ed8f9..341039f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java @@ -216,12 +216,12 @@ public class DirectMessageWriter implements MessageWriter { } /** {@inheritDoc} */ - @Override public boolean isTypeWritten() { + @Override public boolean isHeaderWritten() { return state.isTypeWritten(); } /** {@inheritDoc} */ - @Override public void onTypeWritten() { + @Override public void onHeaderWritten() { state.onTypeWritten(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointRequest.java index 9962c1f..1b9a4b0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointRequest.java @@ -87,11 +87,11 @@ public class GridCheckpointRequest extends MessageAdapter { @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { writer.setBuffer(buf); - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)3))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessage.java index a74850f..1afdb88 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessage.java @@ -182,11 +182,11 @@ public class GridIoMessage extends MessageAdapter { @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { writer.setBuffer(buf); - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)7))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoUserMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoUserMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoUserMessage.java index 059f836..cbe2795 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoUserMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoUserMessage.java @@ -206,11 +206,11 @@ public class GridIoUserMessage extends MessageAdapter { @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { writer.setBuffer(buf); - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)7))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfoBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfoBean.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfoBean.java index 16ccaab..7226b1f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfoBean.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfoBean.java @@ -141,11 +141,11 @@ public class GridDeploymentInfoBean extends MessageAdapter implements GridDeploy @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { writer.setBuffer(buf); - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)5))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java index 0d2dc9a..486dfe3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java @@ -159,11 +159,11 @@ public class GridDeploymentRequest extends MessageAdapter { @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { writer.setBuffer(buf); - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)5))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentResponse.java index 093f7d4..46676e2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentResponse.java @@ -109,11 +109,11 @@ public class GridDeploymentResponse extends MessageAdapter { @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { writer.setBuffer(buf); - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)3))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java index 9c51332..a22e837 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java @@ -264,11 +264,11 @@ public class GridEventStorageMessage extends MessageAdapter { @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { writer.setBuffer(buf); - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)9))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionRequest.java index 23c1306..7819804 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionRequest.java @@ -146,11 +146,11 @@ public class GridCacheEvictionRequest<K, V> extends GridCacheMessage<K, V> imple if (!super.writeTo(buf, writer)) return false; - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)6))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionResponse.java index 1e8fe58..a0d7685 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionResponse.java @@ -135,11 +135,11 @@ public class GridCacheEvictionResponse<K, V> extends GridCacheMessage<K, V> { if (!super.writeTo(buf, writer)) return false; - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)6))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java index 839031b..145ca80 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java @@ -649,11 +649,11 @@ public abstract class GridCacheMessage<K, V> extends MessageAdapter { @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { writer.setBuffer(buf); - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)3))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytes.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytes.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytes.java index dd30b5a..75455c9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytes.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytes.java @@ -123,11 +123,11 @@ public class GridCacheValueBytes extends MessageAdapter { @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { writer.setBuffer(buf); - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)2))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxRequest.java index d6f175e..cd37f8c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxRequest.java @@ -116,11 +116,11 @@ public class GridCacheOptimisticCheckPreparedTxRequest<K, V> extends GridDistrib if (!super.writeTo(buf, writer)) return false; - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)13))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxResponse.java index 0168398..8959c0b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxResponse.java @@ -91,11 +91,11 @@ public class GridCacheOptimisticCheckPreparedTxResponse<K, V> extends GridDistri if (!super.writeTo(buf, writer)) return false; - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)11))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java index b0aa291..59ee52d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java @@ -193,11 +193,11 @@ public class GridCacheTtlUpdateRequest<K, V> extends GridCacheMessage<K, V> { if (!super.writeTo(buf, writer)) return false; - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)9))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java index a7d5819..2f364c0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java @@ -246,11 +246,11 @@ public abstract class GridDistributedBaseMessage<K, V> extends GridCacheMessage< if (!super.writeTo(buf, writer)) return false; - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)8))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java index 576941f..9cce2cc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java @@ -352,11 +352,11 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage if (!super.writeTo(buf, writer)) return false; - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)22))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java index ee993eb..7bd7782 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java @@ -283,11 +283,11 @@ public class GridDistributedLockResponse<K, V> extends GridDistributedBaseMessag if (!super.writeTo(buf, writer)) return false; - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)11))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java index 1f3c6f4..3547dcb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java @@ -252,11 +252,11 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes if (!super.writeTo(buf, writer)) return false; - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)19))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java index 8d21c0e..82b316e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java @@ -80,11 +80,11 @@ public class GridDistributedTxFinishResponse<K, V> extends GridCacheMessage<K, V if (!super.writeTo(buf, writer)) return false; - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)5))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java index 2de6088..30e42b1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java @@ -421,11 +421,11 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe if (!super.writeTo(buf, writer)) return false; - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)23))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java index c8576a1..3e4358d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java @@ -155,11 +155,11 @@ public class GridDistributedTxPrepareResponse<K, V> extends GridDistributedBaseM if (!super.writeTo(buf, writer)) return false; - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)10))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java index 694c30c..674dae5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java @@ -121,11 +121,11 @@ public class GridDistributedUnlockRequest<K, V> extends GridDistributedBaseMessa if (!super.writeTo(buf, writer)) return false; - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)9))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java index 7a2d68c..afcdd67 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java @@ -73,11 +73,11 @@ public class GridDhtAffinityAssignmentRequest<K, V> extends GridCacheMessage<K, if (!super.writeTo(buf, writer)) return false; - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)4))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java index ea797f8..29992d8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java @@ -113,11 +113,11 @@ public class GridDhtAffinityAssignmentResponse<K, V> extends GridCacheMessage<K, if (!super.writeTo(buf, writer)) return false; - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)5))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java index 3022efa..2d6ac22 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java @@ -343,11 +343,11 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { if (!super.writeTo(buf, writer)) return false; - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)31))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java index 409dbb6..7f43d5d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java @@ -205,11 +205,11 @@ public class GridDhtLockResponse<K, V> extends GridDistributedLockResponse<K, V> if (!super.writeTo(buf, writer)) return false; - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)15))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java index ff75d86..7ec88c1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java @@ -230,11 +230,11 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest if (!super.writeTo(buf, writer)) return false; - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)28))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java index c2595c8..9e5d664 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java @@ -75,11 +75,11 @@ public class GridDhtTxFinishResponse<K, V> extends GridDistributedTxFinishRespon if (!super.writeTo(buf, writer)) return false; - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)6))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java index c9fe865..54b4f32 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java @@ -320,11 +320,11 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque if (!super.writeTo(buf, writer)) return false; - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)35))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java index f85d5f8..9154b64 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java @@ -213,11 +213,11 @@ public class GridDhtTxPrepareResponse<K, V> extends GridDistributedTxPrepareResp if (!super.writeTo(buf, writer)) return false; - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)15))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java index a9d035f..1958436 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java @@ -110,11 +110,11 @@ public class GridDhtUnlockRequest<K, V> extends GridDistributedUnlockRequest<K, if (!super.writeTo(buf, writer)) return false; - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)10))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java index f8e60c0..8bdceb2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java @@ -79,11 +79,11 @@ public class GridDhtAtomicDeferredUpdateResponse<K, V> extends GridCacheMessage< if (!super.writeTo(buf, writer)) return false; - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)4))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java index 7e4413a..45e7522 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java @@ -687,11 +687,11 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp if (!super.writeTo(buf, writer)) return false; - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)23))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java index c732be5..26397b2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java @@ -184,11 +184,11 @@ public class GridDhtAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> im if (!super.writeTo(buf, writer)) return false; - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)7))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java index c206264..c7dbef8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java @@ -549,11 +549,11 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im if (!super.writeTo(buf, writer)) return false; - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)22))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java index 468861b..d1e4afb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java @@ -424,11 +424,11 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i if (!super.writeTo(buf, writer)) return false; - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)14))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java index 387c027..90c794b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java @@ -168,11 +168,11 @@ public class GridDhtForceKeysRequest<K, V> extends GridCacheMessage<K, V> implem if (!super.writeTo(buf, writer)) return false; - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)7))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java index a20ce51..82f6389 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java @@ -171,11 +171,11 @@ public class GridDhtForceKeysResponse<K, V> extends GridCacheMessage<K, V> imple if (!super.writeTo(buf, writer)) return false; - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)7))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java index 25d5d19..6686ce2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java @@ -196,11 +196,11 @@ public class GridDhtPartitionDemandMessage<K, V> extends GridCacheMessage<K, V> if (!super.writeTo(buf, writer)) return false; - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)9))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java index b942b57..f3d50c9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java @@ -149,11 +149,11 @@ public class GridDhtPartitionExchangeId extends MessageAdapter implements Compar @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { writer.setBuffer(buf); - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)3))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java index d703186..d4b3f94 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java @@ -279,11 +279,11 @@ public class GridDhtPartitionSupplyMessage<K, V> extends GridCacheMessage<K, V> if (!super.writeTo(buf, writer)) return false; - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)9))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java index 60bea32..3555477 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java @@ -81,11 +81,11 @@ abstract class GridDhtPartitionsAbstractMessage<K, V> extends GridCacheMessage<K if (!super.writeTo(buf, writer)) return false; - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)5))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java index d4b8a14..a63d680 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java @@ -122,11 +122,11 @@ public class GridDhtPartitionsFullMessage<K, V> extends GridDhtPartitionsAbstrac if (!super.writeTo(buf, writer)) return false; - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)7))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java index 0c477c1..639272d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java @@ -101,11 +101,11 @@ public class GridDhtPartitionsSingleMessage<K, V> extends GridDhtPartitionsAbstr if (!super.writeTo(buf, writer)) return false; - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)6))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleRequest.java index 2599c95..bbe669e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleRequest.java @@ -51,11 +51,11 @@ public class GridDhtPartitionsSingleRequest<K, V> extends GridDhtPartitionsAbstr if (!super.writeTo(buf, writer)) return false; - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)5))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java index 44ef152..140800e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java @@ -245,11 +245,11 @@ public class GridNearGetRequest<K, V> extends GridCacheMessage<K, V> implements if (!super.writeTo(buf, writer)) return false; - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)14))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java index 3518915..d927cf1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java @@ -206,11 +206,11 @@ public class GridNearGetResponse<K, V> extends GridCacheMessage<K, V> implements if (!super.writeTo(buf, writer)) return false; - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)10))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java index f640815..b331eda 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java @@ -328,11 +328,11 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> if (!super.writeTo(buf, writer)) return false; - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)34))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java index 8919465..8677a86 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java @@ -187,11 +187,11 @@ public class GridNearLockResponse<K, V> extends GridDistributedLockResponse<K, V if (!super.writeTo(buf, writer)) return false; - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)16))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java index 012a48f..5c75f43 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java @@ -159,11 +159,11 @@ public class GridNearTxFinishRequest<K, V> extends GridDistributedTxFinishReques if (!super.writeTo(buf, writer)) return false; - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)25))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java index 0c8b7c2..598d327 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java @@ -120,11 +120,11 @@ public class GridNearTxFinishResponse<K, V> extends GridDistributedTxFinishRespo if (!super.writeTo(buf, writer)) return false; - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)8))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java index cbf906e..f4a3c06 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java @@ -249,11 +249,11 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ if (!super.writeTo(buf, writer)) return false; - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)33))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java index 5106f94..ee8de20 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java @@ -289,11 +289,11 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes if (!super.writeTo(buf, writer)) return false; - if (!writer.isTypeWritten()) { - if (!writer.writeByte(null, directType())) + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(new MessageHeader(directType(), (byte)18))) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) {
