# gg-9791 - Communication fixes
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ae9df458 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ae9df458 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ae9df458 Branch: refs/heads/ignite-185 Commit: ae9df458a582c28c9179fe46914913bd05a6e54c Parents: a076646 Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Thu Feb 19 13:27:32 2015 -0800 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Thu Feb 19 13:27:33 2015 -0800 ---------------------------------------------------------------------- .../apache/ignite/codegen/MessageCodeGenerator.java | 11 +++++++++++ .../apache/ignite/internal/GridJobCancelRequest.java | 3 +++ .../apache/ignite/internal/GridJobExecuteRequest.java | 3 +++ .../apache/ignite/internal/GridJobExecuteResponse.java | 3 +++ .../apache/ignite/internal/GridJobSiblingsRequest.java | 3 +++ .../apache/ignite/internal/GridTaskCancelRequest.java | 3 +++ .../apache/ignite/internal/GridTaskSessionRequest.java | 3 +++ .../internal/direct/DirectMessageWriterState.java | 13 ++++++++++--- .../managers/checkpoint/GridCheckpointRequest.java | 3 +++ .../internal/managers/communication/GridIoMessage.java | 3 +++ .../managers/communication/GridIoMessageFactory.java | 3 --- .../managers/communication/GridIoUserMessage.java | 3 +++ .../managers/deployment/GridDeploymentInfoBean.java | 3 +++ .../managers/deployment/GridDeploymentRequest.java | 3 +++ .../managers/deployment/GridDeploymentResponse.java | 3 +++ .../managers/eventstorage/GridEventStorageMessage.java | 3 +++ .../processors/cache/GridCacheEvictionRequest.java | 3 +++ .../processors/cache/GridCacheEvictionResponse.java | 3 +++ .../internal/processors/cache/GridCacheMessage.java | 3 +++ .../internal/processors/cache/GridCacheValueBytes.java | 3 +++ .../GridCacheOptimisticCheckPreparedTxRequest.java | 3 +++ .../GridCacheOptimisticCheckPreparedTxResponse.java | 3 +++ .../cache/distributed/GridCacheTtlUpdateRequest.java | 3 +++ .../cache/distributed/GridDistributedBaseMessage.java | 3 +++ .../cache/distributed/GridDistributedLockRequest.java | 3 +++ .../cache/distributed/GridDistributedLockResponse.java | 3 +++ .../distributed/GridDistributedTxFinishRequest.java | 3 +++ .../distributed/GridDistributedTxFinishResponse.java | 3 +++ .../distributed/GridDistributedTxPrepareRequest.java | 3 +++ .../distributed/GridDistributedTxPrepareResponse.java | 3 +++ .../distributed/GridDistributedUnlockRequest.java | 3 +++ .../dht/GridDhtAffinityAssignmentRequest.java | 3 +++ .../dht/GridDhtAffinityAssignmentResponse.java | 3 +++ .../cache/distributed/dht/GridDhtLockRequest.java | 3 +++ .../cache/distributed/dht/GridDhtLockResponse.java | 3 +++ .../cache/distributed/dht/GridDhtTxFinishRequest.java | 3 +++ .../cache/distributed/dht/GridDhtTxFinishResponse.java | 3 +++ .../cache/distributed/dht/GridDhtTxPrepareRequest.java | 3 +++ .../distributed/dht/GridDhtTxPrepareResponse.java | 3 +++ .../cache/distributed/dht/GridDhtUnlockRequest.java | 3 +++ .../atomic/GridDhtAtomicDeferredUpdateResponse.java | 3 +++ .../dht/atomic/GridDhtAtomicUpdateRequest.java | 3 +++ .../dht/atomic/GridDhtAtomicUpdateResponse.java | 3 +++ .../dht/atomic/GridNearAtomicUpdateRequest.java | 3 +++ .../dht/atomic/GridNearAtomicUpdateResponse.java | 3 +++ .../dht/preloader/GridDhtForceKeysRequest.java | 3 +++ .../dht/preloader/GridDhtForceKeysResponse.java | 3 +++ .../dht/preloader/GridDhtPartitionDemandMessage.java | 3 +++ .../dht/preloader/GridDhtPartitionExchangeId.java | 3 +++ .../dht/preloader/GridDhtPartitionSupplyMessage.java | 3 +++ .../preloader/GridDhtPartitionsAbstractMessage.java | 3 +++ .../dht/preloader/GridDhtPartitionsFullMessage.java | 3 +++ .../dht/preloader/GridDhtPartitionsSingleMessage.java | 3 +++ .../dht/preloader/GridDhtPartitionsSingleRequest.java | 3 +++ .../cache/distributed/near/GridNearGetRequest.java | 3 +++ .../cache/distributed/near/GridNearGetResponse.java | 3 +++ .../cache/distributed/near/GridNearLockRequest.java | 3 +++ .../cache/distributed/near/GridNearLockResponse.java | 3 +++ .../distributed/near/GridNearTxFinishRequest.java | 3 +++ .../distributed/near/GridNearTxFinishResponse.java | 3 +++ .../distributed/near/GridNearTxPrepareRequest.java | 3 +++ .../distributed/near/GridNearTxPrepareResponse.java | 3 +++ .../cache/distributed/near/GridNearUnlockRequest.java | 3 +++ .../processors/cache/query/GridCacheQueryRequest.java | 3 +++ .../processors/cache/query/GridCacheQueryResponse.java | 3 +++ .../processors/cache/version/GridCacheVersion.java | 3 +++ .../clock/GridClockDeltaSnapshotMessage.java | 3 +++ .../processors/clock/GridClockDeltaVersion.java | 3 +++ .../processors/continuous/GridContinuousMessage.java | 3 +++ .../processors/dataload/GridDataLoadRequest.java | 3 +++ .../processors/dataload/GridDataLoadResponse.java | 3 +++ .../internal/processors/igfs/IgfsAckMessage.java | 3 +++ .../ignite/internal/processors/igfs/IgfsBlockKey.java | 3 +++ .../internal/processors/igfs/IgfsBlocksMessage.java | 3 +++ .../processors/igfs/IgfsCommunicationMessage.java | 3 +++ .../internal/processors/igfs/IgfsDeleteMessage.java | 3 +++ .../processors/igfs/IgfsFileAffinityRange.java | 3 +++ .../processors/igfs/IgfsFragmentizerRequest.java | 3 +++ .../processors/igfs/IgfsFragmentizerResponse.java | 3 +++ .../internal/processors/igfs/IgfsSyncMessage.java | 3 +++ .../rest/handlers/task/GridTaskResultRequest.java | 3 +++ .../rest/handlers/task/GridTaskResultResponse.java | 3 +++ .../processors/streamer/GridStreamerCancelRequest.java | 3 +++ .../streamer/GridStreamerExecutionRequest.java | 3 +++ .../processors/streamer/GridStreamerResponse.java | 3 +++ .../apache/ignite/internal/util/GridByteArrayList.java | 3 +++ .../org/apache/ignite/internal/util/GridLongList.java | 3 +++ .../spi/collision/jobstealing/JobStealingRequest.java | 3 +++ 88 files changed, 276 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java ---------------------------------------------------------------------- diff --git a/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java b/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java index 07674ff..98a079c 100644 --- a/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java +++ b/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java @@ -366,6 +366,17 @@ public class MessageCodeGenerator { code.add(builder().a(write ? "writer" : "reader").a(".setBuffer(").a(BUF_VAR).a(");").toString()); code.add(EMPTY); + if (!write) { + code.add(builder().a("if (!reader.beforeMessageRead())").toString()); + + indent++; + + code.add(builder().a("return false;").toString()); + code.add(EMPTY); + + indent--; + } + if (superMtd != null) { if (write) returnFalseIfFailed(code, "super." + superMtd, BUF_VAR, "writer"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 6b864a3..670a34a 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 @@ -148,6 +148,9 @@ public class GridJobCancelRequest extends MessageAdapter { @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + switch (readState) { case 0: jobId = reader.readIgniteUuid("jobId"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 549cfad..cd4cba5 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 @@ -558,6 +558,9 @@ public class GridJobExecuteRequest extends MessageAdapter implements GridTaskMes @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + switch (readState) { case 0: clsLdrId = reader.readIgniteUuid("clsLdrId"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 773b30e..3621af9 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 @@ -267,6 +267,9 @@ public class GridJobExecuteResponse extends MessageAdapter implements GridTaskMe @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + switch (readState) { case 0: gridExBytes = reader.readByteArray("gridExBytes"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 e019b12..10ddf79 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 @@ -116,6 +116,9 @@ public class GridJobSiblingsRequest extends MessageAdapter { @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + switch (readState) { case 0: sesId = reader.readIgniteUuid("sesId"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 cf5fdfc..2a17dd8 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 @@ -87,6 +87,9 @@ public class GridTaskCancelRequest extends MessageAdapter { @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + switch (readState) { case 0: sesId = reader.readIgniteUuid("sesId"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 5a59080..6e5e755 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 @@ -136,6 +136,9 @@ public class GridTaskSessionRequest extends MessageAdapter implements GridTaskMe @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + switch (readState) { case 0: attrsBytes = reader.readByteArray("attrsBytes"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriterState.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriterState.java b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriterState.java index a84060d..3c473d2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriterState.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriterState.java @@ -45,16 +45,16 @@ public class DirectMessageWriterState { * @return Whether type is written. */ public boolean isTypeWritten() { - return state() >= 0; + return stack[pos] >= 0; } /** * Callback called after type is written. */ public void onTypeWritten() { - assert state() == -1; + assert stack[pos] == -1; - incrementState(); + stack[pos] = 0; } /** @@ -72,6 +72,13 @@ public class DirectMessageWriterState { } /** + * @param val New state value. + */ + protected void setState(int val) { + stack[pos] = val; + } + + /** * Callback called before inner message is written. */ public void beforeInnerMessageWrite() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 76f97d1..82e7845 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 @@ -122,6 +122,9 @@ public class GridCheckpointRequest extends MessageAdapter { @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + switch (readState) { case 0: cpSpi = reader.readString("cpSpi"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 1c7e598..e18f53d 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 @@ -241,6 +241,9 @@ public class GridIoMessage extends MessageAdapter { @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + switch (readState) { case 0: msg = reader.readMessage("msg"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java index bf482fb..ec74b7f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java @@ -37,7 +37,6 @@ import org.apache.ignite.internal.processors.igfs.*; import org.apache.ignite.internal.processors.rest.handlers.task.*; import org.apache.ignite.internal.processors.streamer.*; import org.apache.ignite.internal.util.*; -import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; import org.apache.ignite.plugin.extensions.communication.*; import org.apache.ignite.spi.collision.jobstealing.*; @@ -65,8 +64,6 @@ public class GridIoMessageFactory implements MessageFactory { /** {@inheritDoc} */ @Override public MessageAdapter create(byte type) { - U.debug("CREATE: " + type); - MessageAdapter msg = null; switch (type) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 9da2d82..ba94f23 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 @@ -265,6 +265,9 @@ public class GridIoUserMessage extends MessageAdapter { @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + switch (readState) { case 0: bodyBytes = reader.readByteArray("bodyBytes"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 a565ecb..083c6e7 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 @@ -188,6 +188,9 @@ public class GridDeploymentInfoBean extends MessageAdapter implements GridDeploy @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + switch (readState) { case 0: clsLdrId = reader.readIgniteUuid("clsLdrId"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 35fc630..8666420 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 @@ -206,6 +206,9 @@ public class GridDeploymentRequest extends MessageAdapter { @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + switch (readState) { case 0: isUndeploy = reader.readBoolean("isUndeploy"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 b660cad..f769334 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 @@ -144,6 +144,9 @@ public class GridDeploymentResponse extends MessageAdapter { @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + switch (readState) { case 0: byteSrc = reader.readMessage("byteSrc"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 529f603..0250363 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 @@ -335,6 +335,9 @@ public class GridEventStorageMessage extends MessageAdapter { @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + switch (readState) { case 0: clsLdrId = reader.readIgniteUuid("clsLdrId"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 8cd1fff..3c25ecb 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 @@ -181,6 +181,9 @@ public class GridCacheEvictionRequest<K, V> extends GridCacheMessage<K, V> imple @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + if (!super.readFrom(buf)) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 34e8414..279808d 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 @@ -170,6 +170,9 @@ public class GridCacheEvictionResponse<K, V> extends GridCacheMessage<K, V> { @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + if (!super.readFrom(buf)) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 980a0f9..1037512 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 @@ -684,6 +684,9 @@ public abstract class GridCacheMessage<K, V> extends MessageAdapter { @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + switch (readState) { case 0: cacheId = reader.readInt("cacheId"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 33d3d31..735738b 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 @@ -152,6 +152,9 @@ public class GridCacheValueBytes extends MessageAdapter { @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + switch (readState) { case 0: bytes = reader.readByteArray("bytes"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 f85efc3..916fc25 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 @@ -163,6 +163,9 @@ public class GridCacheOptimisticCheckPreparedTxRequest<K, V> extends GridDistrib @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + if (!super.readFrom(buf)) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 6bdfe17..c3c3623 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 @@ -126,6 +126,9 @@ public class GridCacheOptimisticCheckPreparedTxResponse<K, V> extends GridDistri @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + if (!super.readFrom(buf)) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 91885d8..5493700 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 @@ -246,6 +246,9 @@ public class GridCacheTtlUpdateRequest<K, V> extends GridCacheMessage<K, V> { @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + if (!super.readFrom(buf)) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 da8b049..068bd47 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 @@ -293,6 +293,9 @@ public abstract class GridDistributedBaseMessage<K, V> extends GridCacheMessage< @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + if (!super.readFrom(buf)) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 a64988b..7a59c05 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 @@ -453,6 +453,9 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + if (!super.readFrom(buf)) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 8245e63..a6f3109 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 @@ -318,6 +318,9 @@ public class GridDistributedLockResponse<K, V> extends GridDistributedBaseMessag @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + if (!super.readFrom(buf)) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 4b4788d..8d149fd 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 @@ -335,6 +335,9 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + if (!super.readFrom(buf)) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 1bac50c..0583640 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 @@ -109,6 +109,9 @@ public class GridDistributedTxFinishResponse<K, V> extends GridCacheMessage<K, V @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + if (!super.readFrom(buf)) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 0e63a2c..2488648 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 @@ -528,6 +528,9 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + if (!super.readFrom(buf)) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 798be80..77e5f8d 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 @@ -184,6 +184,9 @@ public class GridDistributedTxPrepareResponse<K, V> extends GridDistributedBaseM @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + if (!super.readFrom(buf)) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 bb59f5a..a980cf3 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 @@ -144,6 +144,9 @@ public class GridDistributedUnlockRequest<K, V> extends GridDistributedBaseMessa @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + if (!super.readFrom(buf)) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 10b357e..63a38b5 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 @@ -96,6 +96,9 @@ public class GridDhtAffinityAssignmentRequest<K, V> extends GridCacheMessage<K, @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + if (!super.readFrom(buf)) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 68b87bd..5c12305 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 @@ -142,6 +142,9 @@ public class GridDhtAffinityAssignmentResponse<K, V> extends GridCacheMessage<K, @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + if (!super.readFrom(buf)) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 a93843f..f415711 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 @@ -414,6 +414,9 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + if (!super.readFrom(buf)) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 43ab08a..3cdbd2f 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 @@ -246,6 +246,9 @@ public class GridDhtLockResponse<K, V> extends GridDistributedLockResponse<K, V> @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + if (!super.readFrom(buf)) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 f7376c0..ee73d94 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 @@ -301,6 +301,9 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + if (!super.readFrom(buf)) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 c0bc574..56e0fe0 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 @@ -98,6 +98,9 @@ public class GridDhtTxFinishResponse<K, V> extends GridDistributedTxFinishRespon @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + if (!super.readFrom(buf)) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 c5bf7af..1494956 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 @@ -409,6 +409,9 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + if (!super.readFrom(buf)) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 8050afe..6c922c2 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 @@ -260,6 +260,9 @@ public class GridDhtTxPrepareResponse<K, V> extends GridDistributedTxPrepareResp @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + if (!super.readFrom(buf)) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 6d3312a..0aa96fc 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 @@ -133,6 +133,9 @@ public class GridDhtUnlockRequest<K, V> extends GridDistributedUnlockRequest<K, @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + if (!super.readFrom(buf)) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 44cd845..cf85d28 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 @@ -102,6 +102,9 @@ public class GridDhtAtomicDeferredUpdateResponse<K, V> extends GridCacheMessage< @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + if (!super.readFrom(buf)) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 3f51232..4e067c0 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 @@ -810,6 +810,9 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + if (!super.readFrom(buf)) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 1c1c6e1..e018f7d 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 @@ -225,6 +225,9 @@ public class GridDhtAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> im @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + if (!super.readFrom(buf)) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 e3167c9..1b1b6bb 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 @@ -668,6 +668,9 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + if (!super.readFrom(buf)) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 921de6a..0001ee5 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 @@ -507,6 +507,9 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + if (!super.readFrom(buf)) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 8095832..4ccf042 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 @@ -209,6 +209,9 @@ public class GridDhtForceKeysRequest<K, V> extends GridCacheMessage<K, V> implem @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + if (!super.readFrom(buf)) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 ed2b740..b6ab31b 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 @@ -212,6 +212,9 @@ public class GridDhtForceKeysResponse<K, V> extends GridCacheMessage<K, V> imple @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + if (!super.readFrom(buf)) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 c9e1f78..6244579 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 @@ -249,6 +249,9 @@ public class GridDhtPartitionDemandMessage<K, V> extends GridCacheMessage<K, V> @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + if (!super.readFrom(buf)) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 ffdee7e..993219a 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 @@ -184,6 +184,9 @@ public class GridDhtPartitionExchangeId extends MessageAdapter implements Compar @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + switch (readState) { case 0: evt = reader.readInt("evt"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 570567a..8e8b4fb 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 @@ -332,6 +332,9 @@ public class GridDhtPartitionSupplyMessage<K, V> extends GridCacheMessage<K, V> @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + if (!super.readFrom(buf)) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 22bc27e..315fa96 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 @@ -110,6 +110,9 @@ abstract class GridDhtPartitionsAbstractMessage<K, V> extends GridCacheMessage<K @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + if (!super.readFrom(buf)) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 c3c862a..0b7d366 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 @@ -151,6 +151,9 @@ public class GridDhtPartitionsFullMessage<K, V> extends GridDhtPartitionsAbstrac @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + if (!super.readFrom(buf)) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 4fda700..9610b3d 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 @@ -124,6 +124,9 @@ public class GridDhtPartitionsSingleMessage<K, V> extends GridDhtPartitionsAbstr @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + if (!super.readFrom(buf)) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 f7bbdff..0f2a950 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 @@ -65,6 +65,9 @@ public class GridDhtPartitionsSingleRequest<K, V> extends GridDhtPartitionsAbstr @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + if (!super.readFrom(buf)) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 6cd98a8..520ad1c 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 @@ -328,6 +328,9 @@ public class GridNearGetRequest<K, V> extends GridCacheMessage<K, V> implements @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + if (!super.readFrom(buf)) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 3c56357..6d29f8d 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 @@ -265,6 +265,9 @@ public class GridNearGetResponse<K, V> extends GridCacheMessage<K, V> implements @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + if (!super.readFrom(buf)) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 bcb9155..7c65762 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 @@ -417,6 +417,9 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + if (!super.readFrom(buf)) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 f899521..3036e8a 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 @@ -234,6 +234,9 @@ public class GridNearLockResponse<K, V> extends GridDistributedLockResponse<K, V @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + if (!super.readFrom(buf)) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 521d26d..b0e86fd 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 @@ -212,6 +212,9 @@ public class GridNearTxFinishRequest<K, V> extends GridDistributedTxFinishReques @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + if (!super.readFrom(buf)) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 5baf552..a00b595 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 @@ -155,6 +155,9 @@ public class GridNearTxFinishResponse<K, V> extends GridDistributedTxFinishRespo @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + if (!super.readFrom(buf)) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 05f6296..77d28e6 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 @@ -326,6 +326,9 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + if (!super.readFrom(buf)) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 345a486..d359cbf 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 @@ -354,6 +354,9 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + if (!super.readFrom(buf)) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 109c5b8..e762625 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 @@ -67,6 +67,9 @@ public class GridNearUnlockRequest<K, V> extends GridDistributedUnlockRequest<K, @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + if (!super.readFrom(buf)) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 41a2571..f0ba13c 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 @@ -578,6 +578,9 @@ public class GridCacheQueryRequest<K, V> extends GridCacheMessage<K, V> implemen @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + if (!super.readFrom(buf)) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 dac1d25..37bc1ae 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 @@ -261,6 +261,9 @@ public class GridCacheQueryResponse<K, V> extends GridCacheMessage<K, V> impleme @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + if (!super.readFrom(buf)) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 9614dcd..4114443 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 @@ -297,6 +297,9 @@ public class GridCacheVersion extends MessageAdapter implements Comparable<GridC @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + switch (readState) { case 0: globalTime = reader.readLong("globalTime"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 8d88559..b979578 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 @@ -104,6 +104,9 @@ public class GridClockDeltaSnapshotMessage extends MessageAdapter { @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + switch (readState) { case 0: deltas = reader.readMap("deltas", Type.UUID, Type.LONG, false); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 e6096f4..e98f5c6 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 @@ -145,6 +145,9 @@ public class GridClockDeltaVersion extends MessageAdapter implements Comparable< @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + switch (readState) { case 0: topVer = reader.readLong("topVer"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 962d555..4418cd7 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 @@ -175,6 +175,9 @@ public class GridContinuousMessage extends MessageAdapter { @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + switch (readState) { case 0: dataBytes = reader.readByteArray("dataBytes"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 ba7a3d9..405b875 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 @@ -321,6 +321,9 @@ public class GridDataLoadRequest extends MessageAdapter { @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + switch (readState) { case 0: cacheName = reader.readString("cacheName"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 db418e3..df4b332 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 @@ -121,6 +121,9 @@ public class GridDataLoadResponse extends MessageAdapter { @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + switch (readState) { case 0: errBytes = reader.readByteArray("errBytes"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 71fcc74..9b7fcdd 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 @@ -144,6 +144,9 @@ public class IgfsAckMessage extends IgfsCommunicationMessage { @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + if (!super.readFrom(buf)) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 ffd0a79..e681ed6 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 @@ -202,6 +202,9 @@ public final class IgfsBlockKey extends MessageAdapter implements Externalizable @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + switch (readState) { case 0: affKey = reader.readIgniteUuid("affKey"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 6475bf3..1c141e9 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 @@ -125,6 +125,9 @@ public class IgfsBlocksMessage extends IgfsCommunicationMessage { @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + if (!super.readFrom(buf)) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae9df458/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 e30bec1..4278c41 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 @@ -66,6 +66,9 @@ public abstract class IgfsCommunicationMessage extends MessageAdapter { @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); + if (!reader.beforeMessageRead()) + return false; + return true; } }
