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/GridNearUnlockRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearUnlockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearUnlockRequest.java index 266bf97..956f41d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearUnlockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearUnlockRequest.java @@ -53,11 +53,11 @@ public class GridNearUnlockRequest<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)9))) 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/query/GridCacheQueryRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java index eda408c..ac8419d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java @@ -447,11 +447,11 @@ public class GridCacheQueryRequest<K, V> extends GridCacheMessage<K, V> implemen 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/query/GridCacheQueryResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponse.java index a82a0a1..07e0ced 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponse.java @@ -208,11 +208,11 @@ public class GridCacheQueryResponse<K, V> extends GridCacheMessage<K, V> impleme 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/version/GridCacheVersion.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java index 53e43e2..b7bba8e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java @@ -256,11 +256,11 @@ public class GridCacheVersion extends MessageAdapter implements Comparable<GridC @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)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/clock/GridClockDeltaSnapshotMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaSnapshotMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaSnapshotMessage.java index 73bb5ff..5b3d022 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaSnapshotMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaSnapshotMessage.java @@ -75,11 +75,11 @@ public class GridClockDeltaSnapshotMessage 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/clock/GridClockDeltaVersion.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaVersion.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaVersion.java index 60448f2..fb0ce71 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaVersion.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaVersion.java @@ -116,11 +116,11 @@ public class GridClockDeltaVersion extends MessageAdapter implements Comparable< @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/continuous/GridContinuousMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousMessage.java index 325bcb9..723f7ae 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousMessage.java @@ -134,11 +134,11 @@ public class GridContinuousMessage 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)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/dataload/GridDataLoadRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoadRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoadRequest.java index 3ab6f2b..3ec2871 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoadRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoadRequest.java @@ -226,11 +226,11 @@ public class GridDataLoadRequest 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)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/dataload/GridDataLoadResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoadResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoadResponse.java index 9308157..6091d2d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoadResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoadResponse.java @@ -86,11 +86,11 @@ public class GridDataLoadResponse 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/igfs/IgfsAckMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAckMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAckMessage.java index d8c0dde..73319ad 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAckMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAckMessage.java @@ -109,11 +109,11 @@ public class IgfsAckMessage extends IgfsCommunicationMessage { 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)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/igfs/IgfsBlockKey.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlockKey.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlockKey.java index 692992c..4b83de0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlockKey.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlockKey.java @@ -161,11 +161,11 @@ public final class IgfsBlockKey extends MessageAdapter implements Externalizable @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)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/igfs/IgfsBlocksMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlocksMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlocksMessage.java index 204ae7a..cc14ff6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlocksMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlocksMessage.java @@ -90,11 +90,11 @@ public class IgfsBlocksMessage extends IgfsCommunicationMessage { 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)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/igfs/IgfsCommunicationMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsCommunicationMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsCommunicationMessage.java index 4e00704..c157154 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsCommunicationMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsCommunicationMessage.java @@ -52,11 +52,11 @@ public abstract class IgfsCommunicationMessage 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)0))) 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/igfs/IgfsDeleteMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteMessage.java index 24b887f..799deb9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteMessage.java @@ -113,11 +113,11 @@ public class IgfsDeleteMessage extends IgfsCommunicationMessage { 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)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/igfs/IgfsFileAffinityRange.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileAffinityRange.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileAffinityRange.java index 2b9aaae..f949046 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileAffinityRange.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileAffinityRange.java @@ -266,11 +266,11 @@ public class IgfsFileAffinityRange extends MessageAdapter implements Externaliza @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/processors/igfs/IgfsFragmentizerRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerRequest.java index dc12d21..4696942 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerRequest.java @@ -85,11 +85,11 @@ public class IgfsFragmentizerRequest extends IgfsCommunicationMessage { 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)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/igfs/IgfsFragmentizerResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerResponse.java index 7ab4e02..5d071df 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerResponse.java @@ -61,11 +61,11 @@ public class IgfsFragmentizerResponse extends IgfsCommunicationMessage { 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)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/processors/igfs/IgfsSyncMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSyncMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSyncMessage.java index e4123d0..1c72a34 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSyncMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSyncMessage.java @@ -78,11 +78,11 @@ public class IgfsSyncMessage extends IgfsCommunicationMessage { 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)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/rest/handlers/task/GridTaskResultRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultRequest.java index 8369828..fc9309e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultRequest.java @@ -102,11 +102,11 @@ public class GridTaskResultRequest 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/rest/handlers/task/GridTaskResultResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultResponse.java index 68f5afa..112368a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultResponse.java @@ -120,11 +120,11 @@ public class GridTaskResultResponse 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)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/streamer/GridStreamerCancelRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamerCancelRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamerCancelRequest.java index 2fbdd68..bd6c6d0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamerCancelRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamerCancelRequest.java @@ -58,11 +58,11 @@ public class GridStreamerCancelRequest 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/processors/streamer/GridStreamerExecutionRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamerExecutionRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamerExecutionRequest.java index be731d3..31d4b4d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamerExecutionRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamerExecutionRequest.java @@ -153,11 +153,11 @@ public class GridStreamerExecutionRequest 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/processors/streamer/GridStreamerResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamerResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamerResponse.java index ff41bc9..8763dc2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamerResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamerResponse.java @@ -78,11 +78,11 @@ public class GridStreamerResponse 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/util/GridByteArrayList.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridByteArrayList.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridByteArrayList.java index 84b07a4..328e46d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridByteArrayList.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridByteArrayList.java @@ -410,11 +410,11 @@ public class GridByteArrayList extends MessageAdapter implements Externalizable @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/util/GridLongList.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridLongList.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridLongList.java index 8a9fc6c..83f81b5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridLongList.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridLongList.java @@ -508,11 +508,11 @@ public class GridLongList extends MessageAdapter implements Externalizable { @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/plugin/extensions/communication/MessageWriter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriter.java b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriter.java index 9ad5bf2..5b669d6 100644 --- a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriter.java +++ b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriter.java @@ -264,14 +264,14 @@ public interface MessageWriter { MessageAdapter.Type valType); /** - * @return Whether type of current message is already written. + * @return Whether header of current message is already written. */ - public boolean isTypeWritten(); + public boolean isHeaderWritten(); /** - * Callback called when type of the message is written. + * Callback called when header of the message is written. */ - public void onTypeWritten(); + public void onHeaderWritten(); /** * Gets current message state. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f0b647b/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 16e2327..9761dad 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 @@ -58,11 +58,11 @@ public class JobStealingRequest 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/test/java/org/apache/ignite/spi/communication/GridTestMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/GridTestMessage.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/GridTestMessage.java index 97c7f4f..20c009b 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/GridTestMessage.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/GridTestMessage.java @@ -97,11 +97,11 @@ public class GridTestMessage extends MessageAdapter { @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { writer.setBuffer(buf); - if (!writer.isTypeWritten()) { + if (!writer.isHeaderWritten()) { if (!writer.writeByte(null, directType())) return false; - writer.onTypeWritten(); + writer.onHeaderWritten(); } switch (writer.state()) {
