http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e74ff005/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 3ec1e39..eb2682e 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 @@ -133,13 +133,12 @@ public class GridNearTxFinishResponse<K, V> extends GridDistributedTxFinishRespo /** {@inheritDoc} */ @SuppressWarnings("all") - @Override public boolean writeTo(ByteBuffer buf) { - MessageWriteState state = MessageWriteState.get(); + @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { MessageWriter writer = state.writer(); writer.setBuffer(buf); - if (!super.writeTo(buf)) + if (!super.writeTo(buf, state)) return false; if (!state.isTypeWritten()) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e74ff005/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 f566385..e304ce8 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 @@ -239,13 +239,12 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ /** {@inheritDoc} */ @SuppressWarnings("all") - @Override public boolean writeTo(ByteBuffer buf) { - MessageWriteState state = MessageWriteState.get(); + @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { MessageWriter writer = state.writer(); writer.setBuffer(buf); - if (!super.writeTo(buf)) + if (!super.writeTo(buf, state)) return false; if (!state.isTypeWritten()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e74ff005/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 6d99832..6fb9259 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 @@ -246,13 +246,12 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes /** {@inheritDoc} */ @SuppressWarnings("all") - @Override public boolean writeTo(ByteBuffer buf) { - MessageWriteState state = MessageWriteState.get(); + @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { MessageWriter writer = state.writer(); writer.setBuffer(buf); - if (!super.writeTo(buf)) + if (!super.writeTo(buf, state)) return false; if (!state.isTypeWritten()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e74ff005/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 a6a96a0..63af2df 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 @@ -60,13 +60,12 @@ public class GridNearUnlockRequest<K, V> extends GridDistributedUnlockRequest<K, /** {@inheritDoc} */ @SuppressWarnings("all") - @Override public boolean writeTo(ByteBuffer buf) { - MessageWriteState state = MessageWriteState.get(); + @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { MessageWriter writer = state.writer(); writer.setBuffer(buf); - if (!super.writeTo(buf)) + if (!super.writeTo(buf, state)) return false; if (!state.isTypeWritten()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e74ff005/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 ba8ed24..efe5d0a 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 @@ -480,13 +480,12 @@ public class GridCacheQueryRequest<K, V> extends GridCacheMessage<K, V> implemen /** {@inheritDoc} */ @SuppressWarnings("all") - @Override public boolean writeTo(ByteBuffer buf) { - MessageWriteState state = MessageWriteState.get(); + @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { MessageWriter writer = state.writer(); writer.setBuffer(buf); - if (!super.writeTo(buf)) + if (!super.writeTo(buf, state)) return false; if (!state.isTypeWritten()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e74ff005/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 4ec39e1..7fb4b4f 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 @@ -226,13 +226,12 @@ public class GridCacheQueryResponse<K, V> extends GridCacheMessage<K, V> impleme /** {@inheritDoc} */ @SuppressWarnings("all") - @Override public boolean writeTo(ByteBuffer buf) { - MessageWriteState state = MessageWriteState.get(); + @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { MessageWriter writer = state.writer(); writer.setBuffer(buf); - if (!super.writeTo(buf)) + if (!super.writeTo(buf, state)) return false; if (!state.isTypeWritten()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e74ff005/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 0bdc2e0..ab14b5e 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 @@ -253,8 +253,7 @@ public class GridCacheVersion extends MessageAdapter implements Comparable<GridC } /** {@inheritDoc} */ - @Override public boolean writeTo(ByteBuffer buf) { - MessageWriteState state = MessageWriteState.get(); + @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { MessageWriter writer = state.writer(); writer.setBuffer(buf); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e74ff005/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 671f934..7e23b8b 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 @@ -87,8 +87,7 @@ public class GridClockDeltaSnapshotMessage extends MessageAdapter { /** {@inheritDoc} */ @SuppressWarnings("all") - @Override public boolean writeTo(ByteBuffer buf) { - MessageWriteState state = MessageWriteState.get(); + @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { MessageWriter writer = state.writer(); writer.setBuffer(buf); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e74ff005/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 3b052d0..4d006c9 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 @@ -113,8 +113,7 @@ public class GridClockDeltaVersion extends MessageAdapter implements Comparable< } /** {@inheritDoc} */ - @Override public boolean writeTo(ByteBuffer buf) { - MessageWriteState state = MessageWriteState.get(); + @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { MessageWriter writer = state.writer(); writer.setBuffer(buf); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e74ff005/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 3b0ee9f..c72125e 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 @@ -149,8 +149,7 @@ public class GridContinuousMessage extends MessageAdapter { /** {@inheritDoc} */ @SuppressWarnings("fallthrough") - @Override public boolean writeTo(ByteBuffer buf) { - MessageWriteState state = MessageWriteState.get(); + @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { MessageWriter writer = state.writer(); writer.setBuffer(buf); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e74ff005/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 fe9da6c..a4e6ece 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 @@ -223,8 +223,7 @@ public class GridDataLoadRequest extends MessageAdapter { } /** {@inheritDoc} */ - @Override public boolean writeTo(ByteBuffer buf) { - MessageWriteState state = MessageWriteState.get(); + @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { MessageWriter writer = state.writer(); writer.setBuffer(buf); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e74ff005/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 b6c8586..e1c0bb8 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 @@ -99,8 +99,7 @@ public class GridDataLoadResponse extends MessageAdapter { /** {@inheritDoc} */ @SuppressWarnings("all") - @Override public boolean writeTo(ByteBuffer buf) { - MessageWriteState state = MessageWriteState.get(); + @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { MessageWriter writer = state.writer(); writer.setBuffer(buf); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e74ff005/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 04ff8c6..bfda505 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 @@ -122,13 +122,12 @@ public class IgfsAckMessage extends IgfsCommunicationMessage { /** {@inheritDoc} */ @SuppressWarnings("all") - @Override public boolean writeTo(ByteBuffer buf) { - MessageWriteState state = MessageWriteState.get(); + @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { MessageWriter writer = state.writer(); writer.setBuffer(buf); - if (!super.writeTo(buf)) + if (!super.writeTo(buf, state)) return false; if (!state.isTypeWritten()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e74ff005/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 9e9e05e..61262de 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 @@ -175,8 +175,7 @@ public final class IgfsBlockKey extends MessageAdapter implements Externalizable /** {@inheritDoc} */ @SuppressWarnings("fallthrough") - @Override public boolean writeTo(ByteBuffer buf) { - MessageWriteState state = MessageWriteState.get(); + @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { MessageWriter writer = state.writer(); writer.setBuffer(buf); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e74ff005/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 46ffe5f..adb1ca3 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 @@ -102,13 +102,12 @@ public class IgfsBlocksMessage extends IgfsCommunicationMessage { /** {@inheritDoc} */ @SuppressWarnings("all") - @Override public boolean writeTo(ByteBuffer buf) { - MessageWriteState state = MessageWriteState.get(); + @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { MessageWriter writer = state.writer(); writer.setBuffer(buf); - if (!super.writeTo(buf)) + if (!super.writeTo(buf, state)) return false; if (!state.isTypeWritten()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e74ff005/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 ab5ec3b..e9bf72e 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 @@ -53,8 +53,7 @@ public abstract class IgfsCommunicationMessage extends MessageAdapter { } /** {@inheritDoc} */ - @Override public boolean writeTo(ByteBuffer buf) { - MessageWriteState state = MessageWriteState.get(); + @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { MessageWriter writer = state.writer(); writer.setBuffer(buf); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e74ff005/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 1322983..7b58c56 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 @@ -125,13 +125,12 @@ public class IgfsDeleteMessage extends IgfsCommunicationMessage { /** {@inheritDoc} */ @SuppressWarnings("all") - @Override public boolean writeTo(ByteBuffer buf) { - MessageWriteState state = MessageWriteState.get(); + @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { MessageWriter writer = state.writer(); writer.setBuffer(buf); - if (!super.writeTo(buf)) + if (!super.writeTo(buf, state)) return false; if (!state.isTypeWritten()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e74ff005/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 c6b2d48..4c65ed3 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 @@ -281,8 +281,7 @@ public class IgfsFileAffinityRange extends MessageAdapter implements Externaliza /** {@inheritDoc} */ @SuppressWarnings("fallthrough") - @Override public boolean writeTo(ByteBuffer buf) { - MessageWriteState state = MessageWriteState.get(); + @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { MessageWriter writer = state.writer(); writer.setBuffer(buf); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e74ff005/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 e1960b5..62e1375 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 @@ -96,13 +96,12 @@ public class IgfsFragmentizerRequest extends IgfsCommunicationMessage { /** {@inheritDoc} */ @SuppressWarnings("all") - @Override public boolean writeTo(ByteBuffer buf) { - MessageWriteState state = MessageWriteState.get(); + @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { MessageWriter writer = state.writer(); writer.setBuffer(buf); - if (!super.writeTo(buf)) + if (!super.writeTo(buf, state)) return false; if (!state.isTypeWritten()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e74ff005/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 0b4956d..dc4881c 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 @@ -71,13 +71,12 @@ public class IgfsFragmentizerResponse extends IgfsCommunicationMessage { /** {@inheritDoc} */ @SuppressWarnings("all") - @Override public boolean writeTo(ByteBuffer buf) { - MessageWriteState state = MessageWriteState.get(); + @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { MessageWriter writer = state.writer(); writer.setBuffer(buf); - if (!super.writeTo(buf)) + if (!super.writeTo(buf, state)) return false; if (!state.isTypeWritten()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e74ff005/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 ded1f3e..391fa19 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 @@ -89,13 +89,12 @@ public class IgfsSyncMessage extends IgfsCommunicationMessage { /** {@inheritDoc} */ @SuppressWarnings("all") - @Override public boolean writeTo(ByteBuffer buf) { - MessageWriteState state = MessageWriteState.get(); + @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { MessageWriter writer = state.writer(); writer.setBuffer(buf); - if (!super.writeTo(buf)) + if (!super.writeTo(buf, state)) return false; if (!state.isTypeWritten()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e74ff005/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 ab14f1f..6270a30 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 @@ -115,8 +115,7 @@ public class GridTaskResultRequest extends MessageAdapter { /** {@inheritDoc} */ @SuppressWarnings("all") - @Override public boolean writeTo(ByteBuffer buf) { - MessageWriteState state = MessageWriteState.get(); + @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { MessageWriter writer = state.writer(); writer.setBuffer(buf); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e74ff005/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 5eaac0d..37d6105 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 @@ -135,8 +135,7 @@ public class GridTaskResultResponse extends MessageAdapter { /** {@inheritDoc} */ @SuppressWarnings("all") - @Override public boolean writeTo(ByteBuffer buf) { - MessageWriteState state = MessageWriteState.get(); + @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { MessageWriter writer = state.writer(); writer.setBuffer(buf); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e74ff005/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 b7e0c6e..7a6b7fa 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 @@ -69,8 +69,7 @@ public class GridStreamerCancelRequest extends MessageAdapter { /** {@inheritDoc} */ @SuppressWarnings("all") - @Override public boolean writeTo(ByteBuffer buf) { - MessageWriteState state = MessageWriteState.get(); + @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { MessageWriter writer = state.writer(); writer.setBuffer(buf); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e74ff005/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 56ae75a..2ea8024 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 @@ -170,8 +170,7 @@ public class GridStreamerExecutionRequest extends MessageAdapter { /** {@inheritDoc} */ @SuppressWarnings("all") - @Override public boolean writeTo(ByteBuffer buf) { - MessageWriteState state = MessageWriteState.get(); + @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { MessageWriter writer = state.writer(); writer.setBuffer(buf); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e74ff005/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 785b850..af8606d 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 @@ -90,8 +90,7 @@ public class GridStreamerResponse extends MessageAdapter { /** {@inheritDoc} */ @SuppressWarnings("all") - @Override public boolean writeTo(ByteBuffer buf) { - MessageWriteState state = MessageWriteState.get(); + @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { MessageWriter writer = state.writer(); writer.setBuffer(buf); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e74ff005/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 43db36c..28b2e1e 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 @@ -407,8 +407,7 @@ public class GridByteArrayList extends MessageAdapter implements Externalizable } /** {@inheritDoc} */ - @Override public boolean writeTo(ByteBuffer buf) { - MessageWriteState state = MessageWriteState.get(); + @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { MessageWriter writer = state.writer(); writer.setBuffer(buf); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e74ff005/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 cd37648..dcaf563 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 @@ -505,8 +505,7 @@ public class GridLongList extends MessageAdapter implements Externalizable { } /** {@inheritDoc} */ - @Override public boolean writeTo(ByteBuffer buf) { - MessageWriteState state = MessageWriteState.get(); + @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { MessageWriter writer = state.writer(); writer.setBuffer(buf); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e74ff005/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java index 9dea4d2..7901f24 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java @@ -9142,11 +9142,13 @@ public abstract class IgniteUtils { * * @param msg Message. * @param out Stream to write to. - * @param buf Byte buffer that will be passed to {@link MessageAdapter#writeTo(ByteBuffer)} method. + * @param buf Byte buffer that will be passed to {@link MessageAdapter#writeTo(ByteBuffer, MessageWriteState)} method. + * @param formatter Message formatter. * @return Number of written bytes. * @throws IOException In case of error. */ - public static int writeMessageFully(MessageAdapter msg, OutputStream out, ByteBuffer buf) throws IOException { + public static int writeMessageFully(MessageAdapter msg, OutputStream out, ByteBuffer buf, + MessageFormatter formatter) throws IOException { assert msg != null; assert out != null; assert buf != null; @@ -9155,8 +9157,10 @@ public abstract class IgniteUtils { boolean finished = false; int cnt = 0; + MessageWriteState state = MessageWriteState.create(formatter); + while (!finished) { - finished = msg.writeTo(buf); + finished = msg.writeTo(buf, state); out.write(buf.array(), 0, buf.position()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e74ff005/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcToNioAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcToNioAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcToNioAdapter.java index d1ae451..2c24bca 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcToNioAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcToNioAdapter.java @@ -152,18 +152,13 @@ public class IpcToNioAdapter<T> { assert writeBuf.hasArray(); try { - MessageWriteState.create(formatter); - - int cnt = U.writeMessageFully(msg, endp.outputStream(), writeBuf); + int cnt = U.writeMessageFully(msg, endp.outputStream(), writeBuf, formatter); metricsLsnr.onBytesSent(cnt); } catch (IOException | IgniteCheckedException e) { return new GridNioFinishedFuture<Object>(e); } - finally { - MessageWriteState.clear(); - } return new GridNioFinishedFuture<>((Object)null); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e74ff005/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java index 54f647b..61bb550 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java @@ -834,6 +834,11 @@ public class GridNioServer<T> { GridSelectorNioSessionImpl ses = (GridSelectorNioSessionImpl)key.attachment(); + MessageWriteState state = ses.meta(WRITE_STATE.ordinal()); + + if (state == null) + ses.addMeta(WRITE_STATE.ordinal(), state = MessageWriteState.create(formatter)); + boolean handshakeFinished = sslFilter.lock(ses); try { @@ -883,7 +888,7 @@ public class GridNioServer<T> { assert msg != null; - finished = msg.writeTo(buf); + finished = msg.writeTo(buf, state); } // Fill up as many messages as possible to write buffer. @@ -902,7 +907,7 @@ public class GridNioServer<T> { assert msg != null; - finished = msg.writeTo(buf); + finished = msg.writeTo(buf, state); } buf.flip(); @@ -993,114 +998,107 @@ public class GridNioServer<T> { */ @SuppressWarnings("ForLoopReplaceableByForEach") private void processWrite0(SelectionKey key) throws IOException { - try { - WritableByteChannel sockCh = (WritableByteChannel)key.channel(); + WritableByteChannel sockCh = (WritableByteChannel)key.channel(); - GridSelectorNioSessionImpl ses = (GridSelectorNioSessionImpl)key.attachment(); - ByteBuffer buf = ses.writeBuffer(); - NioOperationFuture<?> req = ses.removeMeta(NIO_OPERATION.ordinal()); + GridSelectorNioSessionImpl ses = (GridSelectorNioSessionImpl)key.attachment(); + ByteBuffer buf = ses.writeBuffer(); + NioOperationFuture<?> req = ses.removeMeta(NIO_OPERATION.ordinal()); - MessageWriteState state = ses.meta(WRITE_STATE.ordinal()); + MessageWriteState state = ses.meta(WRITE_STATE.ordinal()); - if (state == null) - ses.addMeta(WRITE_STATE.ordinal(), state = MessageWriteState.create(formatter)); - else - MessageWriteState.set(state); + if (state == null) + ses.addMeta(WRITE_STATE.ordinal(), state = MessageWriteState.create(formatter)); - List<NioOperationFuture<?>> doneFuts = null; + List<NioOperationFuture<?>> doneFuts = null; - while (true) { - if (req == null) { - req = (NioOperationFuture<?>)ses.pollFuture(); + while (true) { + if (req == null) { + req = (NioOperationFuture<?>)ses.pollFuture(); - if (req == null && buf.position() == 0) { - key.interestOps(key.interestOps() & (~SelectionKey.OP_WRITE)); + if (req == null && buf.position() == 0) { + key.interestOps(key.interestOps() & (~SelectionKey.OP_WRITE)); - break; - } + break; } + } - MessageAdapter msg; - boolean finished = false; + MessageAdapter msg; + boolean finished = false; - if (req != null) { - msg = req.directMessage(); + if (req != null) { + msg = req.directMessage(); - assert msg != null; + assert msg != null; - finished = msg.writeTo(buf); + finished = msg.writeTo(buf, state); - if (finished) - state.reset(); - } + if (finished) + state.reset(); + } - // Fill up as many messages as possible to write buffer. - while (finished) { - if (doneFuts == null) - doneFuts = new ArrayList<>(); + // Fill up as many messages as possible to write buffer. + while (finished) { + if (doneFuts == null) + doneFuts = new ArrayList<>(); - doneFuts.add(req); + doneFuts.add(req); - req = (NioOperationFuture<?>)ses.pollFuture(); + req = (NioOperationFuture<?>)ses.pollFuture(); - if (req == null) - break; + if (req == null) + break; - msg = req.directMessage(); + msg = req.directMessage(); - assert msg != null; + assert msg != null; - finished = msg.writeTo(buf); + finished = msg.writeTo(buf, state); - if (finished) - state.reset(); - } + if (finished) + state.reset(); + } - buf.flip(); + buf.flip(); - assert buf.hasRemaining(); + assert buf.hasRemaining(); - if (!skipWrite) { - int cnt = sockCh.write(buf); + if (!skipWrite) { + int cnt = sockCh.write(buf); - if (!F.isEmpty(doneFuts)) { - for (int i = 0; i < doneFuts.size(); i++) - doneFuts.get(i).onDone(); + if (!F.isEmpty(doneFuts)) { + for (int i = 0; i < doneFuts.size(); i++) + doneFuts.get(i).onDone(); - doneFuts.clear(); - } + doneFuts.clear(); + } - if (log.isTraceEnabled()) - log.trace("Bytes sent [sockCh=" + sockCh + ", cnt=" + cnt + ']'); + if (log.isTraceEnabled()) + log.trace("Bytes sent [sockCh=" + sockCh + ", cnt=" + cnt + ']'); - if (metricsLsnr != null) - metricsLsnr.onBytesSent(cnt); + if (metricsLsnr != null) + metricsLsnr.onBytesSent(cnt); - ses.bytesSent(cnt); + ses.bytesSent(cnt); + } + else { + // For test purposes only (skipWrite is set to true in tests only). + try { + U.sleep(50); } - else { - // For test purposes only (skipWrite is set to true in tests only). - try { - U.sleep(50); - } - catch (IgniteInterruptedCheckedException e) { - throw new IOException("Thread has been interrupted.", e); - } + catch (IgniteInterruptedCheckedException e) { + throw new IOException("Thread has been interrupted.", e); } + } - if (buf.hasRemaining()) { - buf.compact(); + if (buf.hasRemaining()) { + buf.compact(); - ses.addMeta(NIO_OPERATION.ordinal(), req); + ses.addMeta(NIO_OPERATION.ordinal(), req); - break; - } - else - buf.clear(); + break; } - } - finally { - MessageWriteState.clear(); + else + buf.clear(); } } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e74ff005/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridShmemCommunicationClient.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridShmemCommunicationClient.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridShmemCommunicationClient.java index e5ab12a..bd59ff7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridShmemCommunicationClient.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridShmemCommunicationClient.java @@ -116,18 +116,13 @@ public class GridShmemCommunicationClient extends GridAbstractCommunicationClien assert writeBuf.hasArray(); try { - MessageWriteState.create(formatter); - - int cnt = U.writeMessageFully(msg, shmem.outputStream(), writeBuf); + int cnt = U.writeMessageFully(msg, shmem.outputStream(), writeBuf, formatter); metricsLsnr.onBytesSent(cnt); } catch (IOException e) { throw new IgniteCheckedException("Failed to send message to remote node: " + shmem, e); } - finally { - MessageWriteState.clear(); - } markUsed(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e74ff005/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridTcpCommunicationClient.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridTcpCommunicationClient.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridTcpCommunicationClient.java index 4dc326d..297d2a3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridTcpCommunicationClient.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridTcpCommunicationClient.java @@ -197,18 +197,13 @@ public class GridTcpCommunicationClient extends GridAbstractCommunicationClient assert writeBuf.hasArray(); try { - MessageWriteState.create(formatter); - - int cnt = U.writeMessageFully(msg, out, writeBuf); + int cnt = U.writeMessageFully(msg, out, writeBuf, formatter); metricsLsnr.onBytesSent(cnt); } catch (IOException e) { throw new IgniteCheckedException("Failed to send message to remote node: " + sock.getRemoteSocketAddress(), e); } - finally { - MessageWriteState.clear(); - } markUsed(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e74ff005/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageAdapter.java b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageAdapter.java index 02280c2..2f960a7 100644 --- a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageAdapter.java @@ -44,9 +44,10 @@ public abstract class MessageAdapter implements Serializable, Cloneable { * Writes this message to provided byte buffer. * * @param buf Byte buffer. + * @param state Current state; * @return Whether message was fully written. */ - public abstract boolean writeTo(ByteBuffer buf); + public abstract boolean writeTo(ByteBuffer buf, MessageWriteState state); /** * Reads this message from provided byte buffer. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e74ff005/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriteState.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriteState.java b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriteState.java index 10b50bd..ba21e25 100644 --- a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriteState.java +++ b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriteState.java @@ -23,8 +23,6 @@ import org.apache.ignite.internal.direct.*; * TODO */ public final class MessageWriteState { - public static final ThreadLocal<MessageWriteState> WRITE_STATE = new ThreadLocal<>(); - public static MessageWriteState create(MessageFormatter formatter) { MessageWriter writer = formatter.writer(); @@ -33,29 +31,9 @@ public final class MessageWriteState { // TODO: rework ((DirectMessageWriter)writer).state(state); - WRITE_STATE.set(state); - - return state; - } - - public static void set(MessageWriteState state) { - assert state != null; - - WRITE_STATE.set(state); - } - - public static MessageWriteState get() { - MessageWriteState state = WRITE_STATE.get(); - - assert state != null; - return state; } - public static void clear() { - WRITE_STATE.remove(); - } - private final MessageWriter writer; private final Stack stack; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e74ff005/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 bfa49e9..62e48d1 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingRequest.java @@ -69,8 +69,7 @@ public class JobStealingRequest extends MessageAdapter { /** {@inheritDoc} */ @SuppressWarnings("all") - @Override public boolean writeTo(ByteBuffer buf) { - MessageWriteState state = MessageWriteState.get(); + @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { MessageWriter writer = state.writer(); writer.setBuffer(buf); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e74ff005/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java index 438fc44..193e4d7 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java @@ -2209,7 +2209,9 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter buf.order(ByteOrder.nativeOrder()); - boolean written = msg.writeTo(buf); + MessageWriteState state = MessageWriteState.create(getSpiContext().messageFormatter()); + + boolean written = msg.writeTo(buf, state); assert written; @@ -3031,7 +3033,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter } /** {@inheritDoc} */ - @Override public boolean writeTo(ByteBuffer buf) { + @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { if (buf.remaining() < 33) return false; @@ -3123,7 +3125,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter } /** {@inheritDoc} */ - @Override public boolean writeTo(ByteBuffer buf) { + @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { if (buf.remaining() < 9) return false; @@ -3204,7 +3206,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter } /** {@inheritDoc} */ - @Override public boolean writeTo(ByteBuffer buf) { + @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { assert nodeIdBytes.length == 16; if (buf.remaining() < 17) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e74ff005/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java index 58cd389..3fd87a5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java @@ -155,7 +155,7 @@ public class GridCommunicationSendMessageSelfTest extends GridCommonAbstractTest } /** {@inheritDoc} */ - @Override public boolean writeTo(ByteBuffer buf) { + @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { // writer.setBuffer(buf); // // return writer.writeByte(null, directType()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e74ff005/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java index a9f0203..22c6a04 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java @@ -231,7 +231,7 @@ public class GridIoManagerSelfTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ - @Override public boolean writeTo(ByteBuffer buf) { + @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { return true; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e74ff005/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTestMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTestMessage.java b/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTestMessage.java index 1c63e60..b6353b7 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTestMessage.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTestMessage.java @@ -119,7 +119,7 @@ class GridTestMessage extends MessageAdapter implements Externalizable { } /** {@inheritDoc} */ - @Override public boolean writeTo(ByteBuffer buf) { + @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { return true; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e74ff005/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 505809e..8ab4b6e 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 @@ -115,7 +115,7 @@ public class GridTestMessage extends MessageAdapter { /** {@inheritDoc} */ @SuppressWarnings("fallthrough") - @Override public boolean writeTo(ByteBuffer buf) { + @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { // writer.setBuffer(buf); // // if (!typeWritten) {
