ignite-nio - Removing message clone
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e74ff005 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e74ff005 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e74ff005 Branch: refs/heads/sprint-1 Commit: e74ff005db2442888c5fc67096a0dbfe9fbbac93 Parents: 6f20eb2 Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Sat Feb 14 15:59:26 2015 -0800 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Sat Feb 14 15:59:27 2015 -0800 ---------------------------------------------------------------------- .../CommunicationMessageCodeGenerator.java | 8 +- .../ignite/internal/GridJobCancelRequest.java | 3 +- .../ignite/internal/GridJobExecuteRequest.java | 3 +- .../ignite/internal/GridJobExecuteResponse.java | 3 +- .../ignite/internal/GridJobSiblingsRequest.java | 3 +- .../internal/GridJobSiblingsResponse.java | 3 +- .../ignite/internal/GridTaskCancelRequest.java | 3 +- .../ignite/internal/GridTaskSessionRequest.java | 3 +- .../internal/direct/DirectByteBufferStream.java | 2 +- .../checkpoint/GridCheckpointRequest.java | 3 +- .../managers/communication/GridIoMessage.java | 3 +- .../communication/GridIoUserMessage.java | 3 +- .../deployment/GridDeploymentInfoBean.java | 3 +- .../deployment/GridDeploymentRequest.java | 3 +- .../deployment/GridDeploymentResponse.java | 3 +- .../eventstorage/GridEventStorageMessage.java | 3 +- .../cache/GridCacheEvictionRequest.java | 5 +- .../cache/GridCacheEvictionResponse.java | 5 +- .../processors/cache/GridCacheMessage.java | 3 +- .../processors/cache/GridCacheValueBytes.java | 3 +- ...idCacheOptimisticCheckPreparedTxRequest.java | 5 +- ...dCacheOptimisticCheckPreparedTxResponse.java | 5 +- ...CachePessimisticCheckCommittedTxRequest.java | 5 +- ...achePessimisticCheckCommittedTxResponse.java | 5 +- .../distributed/GridCacheTtlUpdateRequest.java | 5 +- .../distributed/GridDistributedBaseMessage.java | 5 +- .../distributed/GridDistributedLockRequest.java | 5 +- .../GridDistributedLockResponse.java | 5 +- .../GridDistributedTxFinishRequest.java | 5 +- .../GridDistributedTxFinishResponse.java | 5 +- .../GridDistributedTxPrepareRequest.java | 5 +- .../GridDistributedTxPrepareResponse.java | 5 +- .../GridDistributedUnlockRequest.java | 5 +- .../dht/GridDhtAffinityAssignmentRequest.java | 5 +- .../dht/GridDhtAffinityAssignmentResponse.java | 5 +- .../distributed/dht/GridDhtLockRequest.java | 5 +- .../distributed/dht/GridDhtLockResponse.java | 5 +- .../distributed/dht/GridDhtTxFinishRequest.java | 5 +- .../dht/GridDhtTxFinishResponse.java | 5 +- .../dht/GridDhtTxPrepareRequest.java | 5 +- .../dht/GridDhtTxPrepareResponse.java | 5 +- .../distributed/dht/GridDhtUnlockRequest.java | 5 +- .../GridDhtAtomicDeferredUpdateResponse.java | 5 +- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 5 +- .../dht/atomic/GridDhtAtomicUpdateResponse.java | 5 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 5 +- .../atomic/GridNearAtomicUpdateResponse.java | 5 +- .../dht/preloader/GridDhtForceKeysRequest.java | 5 +- .../dht/preloader/GridDhtForceKeysResponse.java | 5 +- .../GridDhtPartitionDemandMessage.java | 5 +- .../preloader/GridDhtPartitionExchangeId.java | 3 +- .../GridDhtPartitionSupplyMessage.java | 5 +- .../GridDhtPartitionsAbstractMessage.java | 5 +- .../preloader/GridDhtPartitionsFullMessage.java | 5 +- .../GridDhtPartitionsSingleMessage.java | 5 +- .../GridDhtPartitionsSingleRequest.java | 5 +- .../distributed/near/GridNearGetRequest.java | 25 ++-- .../distributed/near/GridNearGetResponse.java | 5 +- .../distributed/near/GridNearLockRequest.java | 5 +- .../distributed/near/GridNearLockResponse.java | 5 +- .../near/GridNearTxFinishRequest.java | 5 +- .../near/GridNearTxFinishResponse.java | 5 +- .../near/GridNearTxPrepareRequest.java | 5 +- .../near/GridNearTxPrepareResponse.java | 5 +- .../distributed/near/GridNearUnlockRequest.java | 5 +- .../cache/query/GridCacheQueryRequest.java | 5 +- .../cache/query/GridCacheQueryResponse.java | 5 +- .../cache/version/GridCacheVersion.java | 3 +- .../clock/GridClockDeltaSnapshotMessage.java | 3 +- .../processors/clock/GridClockDeltaVersion.java | 3 +- .../continuous/GridContinuousMessage.java | 3 +- .../dataload/GridDataLoadRequest.java | 3 +- .../dataload/GridDataLoadResponse.java | 3 +- .../processors/igfs/IgfsAckMessage.java | 5 +- .../internal/processors/igfs/IgfsBlockKey.java | 3 +- .../processors/igfs/IgfsBlocksMessage.java | 5 +- .../igfs/IgfsCommunicationMessage.java | 3 +- .../processors/igfs/IgfsDeleteMessage.java | 5 +- .../processors/igfs/IgfsFileAffinityRange.java | 3 +- .../igfs/IgfsFragmentizerRequest.java | 5 +- .../igfs/IgfsFragmentizerResponse.java | 5 +- .../processors/igfs/IgfsSyncMessage.java | 5 +- .../handlers/task/GridTaskResultRequest.java | 3 +- .../handlers/task/GridTaskResultResponse.java | 3 +- .../streamer/GridStreamerCancelRequest.java | 3 +- .../streamer/GridStreamerExecutionRequest.java | 3 +- .../streamer/GridStreamerResponse.java | 3 +- .../ignite/internal/util/GridByteArrayList.java | 3 +- .../ignite/internal/util/GridLongList.java | 3 +- .../ignite/internal/util/IgniteUtils.java | 10 +- .../internal/util/ipc/IpcToNioAdapter.java | 7 +- .../ignite/internal/util/nio/GridNioServer.java | 148 +++++++++---------- .../util/nio/GridShmemCommunicationClient.java | 7 +- .../util/nio/GridTcpCommunicationClient.java | 7 +- .../communication/MessageAdapter.java | 3 +- .../communication/MessageWriteState.java | 22 --- .../jobstealing/JobStealingRequest.java | 3 +- .../communication/tcp/TcpCommunicationSpi.java | 10 +- .../GridCommunicationSendMessageSelfTest.java | 2 +- .../communication/GridIoManagerSelfTest.java | 2 +- .../communication/GridTestMessage.java | 2 +- .../spi/communication/GridTestMessage.java | 2 +- 102 files changed, 253 insertions(+), 371 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e74ff005/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 615e187..53808c1 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 @@ -159,7 +159,7 @@ public class CommunicationMessageCodeGenerator { if (!skip) { src.add(line); - if (line.contains("public boolean writeTo(ByteBuffer buf)")) { + if (line.contains("public boolean writeTo(ByteBuffer buf, MessageWriteState state)")) { src.addAll(write); skip = true; @@ -354,7 +354,6 @@ public class CommunicationMessageCodeGenerator { assert code != null; if (write) { - code.add(builder().a("MessageWriteState state = MessageWriteState.get();").toString()); code.add(builder().a("MessageWriter writer = state.writer();").toString()); code.add(EMPTY); } @@ -363,7 +362,10 @@ public class CommunicationMessageCodeGenerator { code.add(EMPTY); if (superMtd != null) { - returnFalseIfFailed(code, "super." + superMtd, BUF_VAR); + if (write) + returnFalseIfFailed(code, "super." + superMtd, BUF_VAR, "state"); + else + returnFalseIfFailed(code, "super." + superMtd, BUF_VAR); code.add(EMPTY); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e74ff005/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 7dc9b43..88e6ad3 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 @@ -126,8 +126,7 @@ public class GridJobCancelRequest 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/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 2381092..dd6b87a 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 @@ -451,8 +451,7 @@ public class GridJobExecuteRequest extends MessageAdapter implements GridTaskMes /** {@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/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 933bde6..1a01dad 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 @@ -229,8 +229,7 @@ public class GridJobExecuteResponse extends MessageAdapter implements GridTaskMe /** {@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/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 b14876a..5d9621d 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 @@ -100,8 +100,7 @@ public class GridJobSiblingsRequest 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/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 88b8047..7a34f86 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 @@ -92,8 +92,7 @@ public class GridJobSiblingsResponse 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/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 5251d0c..da7b73b 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 @@ -75,8 +75,7 @@ public class GridTaskCancelRequest 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/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 b06cb09..f47d0aa 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 @@ -115,8 +115,7 @@ public class GridTaskSessionRequest extends MessageAdapter implements GridTaskMe /** {@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/direct/DirectByteBufferStream.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectByteBufferStream.java b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectByteBufferStream.java index 68eb4ad..e642790 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectByteBufferStream.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectByteBufferStream.java @@ -602,7 +602,7 @@ public class DirectByteBufferStream { try { state.forward(); - lastFinished = msg.writeTo(buf); + lastFinished = msg.writeTo(buf, state); } finally { state.backward(lastFinished); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e74ff005/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 9fa2706..0e3b1a8 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 @@ -100,8 +100,7 @@ public class GridCheckpointRequest 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/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 31b4f96..50dc9ed 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 @@ -201,8 +201,7 @@ public class GridIoMessage 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/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 5a87102..51b7d57 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 @@ -226,8 +226,7 @@ public class GridIoUserMessage 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/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 3310d5f..bd80df1 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 @@ -156,8 +156,7 @@ public class GridDeploymentInfoBean extends MessageAdapter implements GridDeploy /** {@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/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 cdcccb9..e84caa9 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 @@ -175,8 +175,7 @@ public class GridDeploymentRequest 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/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 6414955..285b78c 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 @@ -122,8 +122,7 @@ public class GridDeploymentResponse 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/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 b89e3fe..0590987 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 @@ -286,8 +286,7 @@ public class GridEventStorageMessage 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/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 2b487c9..57487d4 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 @@ -159,13 +159,12 @@ public class GridCacheEvictionRequest<K, V> extends GridCacheMessage<K, V> imple /** {@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/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 b57e812..c3d8359 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 @@ -148,13 +148,12 @@ public class GridCacheEvictionResponse<K, V> extends GridCacheMessage<K, V> { /** {@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/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 6fe4216..b2bd3c0 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 @@ -658,8 +658,7 @@ public abstract class GridCacheMessage<K, V> 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/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 5729269..8385ec3 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 @@ -120,8 +120,7 @@ public class GridCacheValueBytes 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/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 7712ac3..888d270 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 @@ -130,13 +130,12 @@ public class GridCacheOptimisticCheckPreparedTxRequest<K, V> extends GridDistrib /** {@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/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 0aa4ac1..94991d6 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 @@ -103,13 +103,12 @@ public class GridCacheOptimisticCheckPreparedTxResponse<K, V> extends GridDistri /** {@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/GridCachePessimisticCheckCommittedTxRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxRequest.java index 86324a8..0869c73 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxRequest.java @@ -162,13 +162,12 @@ public class GridCachePessimisticCheckCommittedTxRequest<K, V> extends GridDistr /** {@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/GridCachePessimisticCheckCommittedTxResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxResponse.java index cdb73b9..594acb8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxResponse.java @@ -148,13 +148,12 @@ public class GridCachePessimisticCheckCommittedTxResponse<K, V> extends GridDist /** {@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/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 cea818c..fceca4a 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,13 +193,12 @@ public class GridCacheTtlUpdateRequest<K, V> extends GridCacheMessage<K, V> { } /** {@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); - 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/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 725df25..aa6c607 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 @@ -257,13 +257,12 @@ public abstract class GridDistributedBaseMessage<K, V> extends GridCacheMessage< /** {@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/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 88b34c8..1b1242a 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 @@ -462,13 +462,12 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage /** {@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/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 762a73a..8c5934c 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 @@ -298,13 +298,12 @@ public class GridDistributedLockResponse<K, V> extends GridDistributedBaseMessag /** {@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/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 77aa1af..ae613f0 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 @@ -376,13 +376,12 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes /** {@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/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 3e2313e..1811457 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 @@ -92,13 +92,12 @@ public class GridDistributedTxFinishResponse<K, V> extends GridCacheMessage<K, V /** {@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/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 6af8916..d0b4427 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 @@ -437,13 +437,12 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe /** {@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/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 5355f97..e024724 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 @@ -169,13 +169,12 @@ public class GridDistributedTxPrepareResponse<K, V> extends GridDistributedBaseM /** {@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/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 f5fe1eb..d76066e 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 @@ -133,13 +133,12 @@ public class GridDistributedUnlockRequest<K, V> extends GridDistributedBaseMessa /** {@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/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 8832adc..32986fb 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 @@ -82,13 +82,12 @@ public class GridDhtAffinityAssignmentRequest<K, V> extends GridCacheMessage<K, } /** {@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); - 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/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 b26e54b..e3e7d69 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 @@ -123,13 +123,12 @@ public class GridDhtAffinityAssignmentResponse<K, V> extends GridCacheMessage<K, } /** {@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); - 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/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 4746103..3f946d2 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 @@ -367,13 +367,12 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { /** {@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/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 0bc988c..9456e11 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 @@ -220,13 +220,12 @@ public class GridDhtLockResponse<K, V> extends GridDistributedLockResponse<K, V> /** {@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/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 f12cedc..289315a 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 @@ -377,13 +377,12 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest /** {@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/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 4796c1c..0b2c294 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 @@ -85,13 +85,12 @@ public class GridDhtTxFinishResponse<K, V> extends GridDistributedTxFinishRespon /** {@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/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 985104b..747a959 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 @@ -341,13 +341,12 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque /** {@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/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 be8f5cd..9398240 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 @@ -227,13 +227,12 @@ public class GridDhtTxPrepareResponse<K, V> extends GridDistributedTxPrepareResp /** {@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/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 e0efaa2..2b2e70b 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 @@ -121,13 +121,12 @@ public class GridDhtUnlockRequest<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/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 5e16c4a..a9a2181 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 @@ -89,13 +89,12 @@ public class GridDhtAtomicDeferredUpdateResponse<K, V> extends GridCacheMessage< /** {@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/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 a227a97..598dccb 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 @@ -723,13 +723,12 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp /** {@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/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 f1a557a..140f941 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 @@ -200,13 +200,12 @@ public class GridDhtAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> im /** {@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/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 2198e72..e2a8265 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 @@ -583,13 +583,12 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im /** {@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/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 b75d4e6..9cfe6dc 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 @@ -450,13 +450,12 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i /** {@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); - 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/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 7b523ee..5ee0ae2 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 @@ -182,13 +182,12 @@ public class GridDhtForceKeysRequest<K, V> extends GridCacheMessage<K, V> implem /** {@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/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 e2ceaf4..eb68770 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 @@ -186,13 +186,12 @@ public class GridDhtForceKeysResponse<K, V> extends GridCacheMessage<K, V> imple /** {@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/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 93e48ca..69f622f 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 @@ -212,13 +212,12 @@ public class GridDhtPartitionDemandMessage<K, V> extends GridCacheMessage<K, V> /** {@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/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 0aeb6ee..43847a6 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 @@ -146,8 +146,7 @@ public class GridDhtPartitionExchangeId extends MessageAdapter implements Compar } /** {@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/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 8748350..58969b3 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 @@ -297,13 +297,12 @@ public class GridDhtPartitionSupplyMessage<K, V> extends GridCacheMessage<K, V> /** {@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/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 584e06d..5c798d8 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 @@ -86,13 +86,12 @@ abstract class GridDhtPartitionsAbstractMessage<K, V> extends GridCacheMessage<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/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 0552756..a773e61 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 @@ -134,13 +134,12 @@ public class GridDhtPartitionsFullMessage<K, V> extends GridDhtPartitionsAbstrac /** {@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/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 154a410..1399519 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 @@ -112,13 +112,12 @@ public class GridDhtPartitionsSingleMessage<K, V> extends GridDhtPartitionsAbstr /** {@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/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 f5e0977..0278a6e 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 @@ -58,13 +58,12 @@ public class GridDhtPartitionsSingleRequest<K, V> extends GridDhtPartitionsAbstr /** {@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/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 8a3343e..6361d9e 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 @@ -266,13 +266,12 @@ public class GridNearGetRequest<K, V> extends GridCacheMessage<K, V> implements /** {@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()) { @@ -320,31 +319,31 @@ public class GridNearGetRequest<K, V> extends GridCacheMessage<K, V> implements state.increment(); case 9: - if (!writer.writeUuid("subjId", subjId)) + if (!writer.writeBoolean("skipVals", skipVals)) return false; state.increment(); case 10: - if (!writer.writeInt("taskNameHash", taskNameHash)) + if (!writer.writeUuid("subjId", subjId)) return false; state.increment(); case 11: - if (!writer.writeLong("topVer", topVer)) + if (!writer.writeInt("taskNameHash", taskNameHash)) return false; state.increment(); case 12: - if (!writer.writeMessage("ver", ver)) + if (!writer.writeLong("topVer", topVer)) return false; state.increment(); case 13: - if (!writer.writeBoolean("skipVals", skipVals)) + if (!writer.writeMessage("ver", ver)) return false; state.increment(); @@ -412,7 +411,7 @@ public class GridNearGetRequest<K, V> extends GridCacheMessage<K, V> implements readState++; case 9: - subjId = reader.readUuid("subjId"); + skipVals = reader.readBoolean("skipVals"); if (!reader.isLastRead()) return false; @@ -420,7 +419,7 @@ public class GridNearGetRequest<K, V> extends GridCacheMessage<K, V> implements readState++; case 10: - taskNameHash = reader.readInt("taskNameHash"); + subjId = reader.readUuid("subjId"); if (!reader.isLastRead()) return false; @@ -428,7 +427,7 @@ public class GridNearGetRequest<K, V> extends GridCacheMessage<K, V> implements readState++; case 11: - topVer = reader.readLong("topVer"); + taskNameHash = reader.readInt("taskNameHash"); if (!reader.isLastRead()) return false; @@ -436,7 +435,7 @@ public class GridNearGetRequest<K, V> extends GridCacheMessage<K, V> implements readState++; case 12: - ver = reader.readMessage("ver"); + topVer = reader.readLong("topVer"); if (!reader.isLastRead()) return false; @@ -444,7 +443,7 @@ public class GridNearGetRequest<K, V> extends GridCacheMessage<K, V> implements readState++; case 13: - skipVals = reader.readBoolean("skipVals"); + ver = reader.readMessage("ver"); if (!reader.isLastRead()) return false; 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/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 0180227..095e455 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 @@ -224,13 +224,12 @@ public class GridNearGetResponse<K, V> extends GridCacheMessage<K, V> implements /** {@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/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 081a2a6..09e5c64 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 @@ -359,13 +359,12 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> /** {@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/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 9f353b5..7cc1c46 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 @@ -201,13 +201,12 @@ public class GridNearLockResponse<K, V> extends GridDistributedLockResponse<K, V /** {@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/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 8e45af1..9fb781b 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 @@ -179,13 +179,12 @@ public class GridNearTxFinishRequest<K, V> extends GridDistributedTxFinishReques /** {@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()) {
