IGNITE-1281 - Fixed afterMessageRead() for hierarchical classes.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/86e3b27f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/86e3b27f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/86e3b27f Branch: refs/heads/ignite-1281 Commit: 86e3b27f3a2ccd5747176c7d20fade960a928a08 Parents: 37538fc Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Mon Aug 24 14:47:35 2015 -0700 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Mon Aug 24 14:47:35 2015 -0700 ---------------------------------------------------------------------- .../apache/ignite/codegen/MessageCodeGenerator.java | 13 +++++++------ .../apache/ignite/internal/GridJobCancelRequest.java | 2 +- .../apache/ignite/internal/GridJobExecuteRequest.java | 2 +- .../apache/ignite/internal/GridJobExecuteResponse.java | 2 +- .../apache/ignite/internal/GridJobSiblingsRequest.java | 2 +- .../ignite/internal/GridJobSiblingsResponse.java | 2 +- .../apache/ignite/internal/GridTaskCancelRequest.java | 2 +- .../apache/ignite/internal/GridTaskSessionRequest.java | 2 +- .../managers/checkpoint/GridCheckpointRequest.java | 2 +- .../internal/managers/communication/GridIoMessage.java | 2 +- .../managers/communication/GridIoUserMessage.java | 2 +- .../managers/deployment/GridDeploymentInfoBean.java | 2 +- .../managers/deployment/GridDeploymentRequest.java | 2 +- .../managers/deployment/GridDeploymentResponse.java | 2 +- .../managers/eventstorage/GridEventStorageMessage.java | 2 +- .../processors/affinity/AffinityTopologyVersion.java | 2 +- .../processors/cache/CacheEntryInfoCollection.java | 2 +- .../processors/cache/CacheEntryPredicateAdapter.java | 2 +- .../cache/CacheEntryPredicateContainsValue.java | 2 +- .../cache/CacheEntrySerializablePredicate.java | 2 +- .../internal/processors/cache/CacheEvictionEntry.java | 2 +- .../processors/cache/CacheInvokeDirectResult.java | 2 +- .../internal/processors/cache/CacheObjectAdapter.java | 2 +- .../processors/cache/CacheObjectByteArrayImpl.java | 2 +- .../internal/processors/cache/GridCacheEntryInfo.java | 2 +- .../processors/cache/GridCacheEvictionRequest.java | 2 +- .../processors/cache/GridCacheEvictionResponse.java | 2 +- .../internal/processors/cache/GridCacheMessage.java | 2 +- .../internal/processors/cache/GridCacheReturn.java | 2 +- .../cache/distributed/GridCacheTtlUpdateRequest.java | 2 +- .../cache/distributed/GridCacheTxRecoveryRequest.java | 2 +- .../cache/distributed/GridCacheTxRecoveryResponse.java | 2 +- .../cache/distributed/GridDistributedBaseMessage.java | 2 +- .../cache/distributed/GridDistributedLockRequest.java | 2 +- .../cache/distributed/GridDistributedLockResponse.java | 2 +- .../distributed/GridDistributedTxFinishRequest.java | 2 +- .../distributed/GridDistributedTxFinishResponse.java | 2 +- .../distributed/GridDistributedTxPrepareRequest.java | 2 +- .../distributed/GridDistributedTxPrepareResponse.java | 2 +- .../distributed/GridDistributedUnlockRequest.java | 2 +- .../dht/GridDhtAffinityAssignmentRequest.java | 2 +- .../dht/GridDhtAffinityAssignmentResponse.java | 2 +- .../cache/distributed/dht/GridDhtLockRequest.java | 6 ++---- .../cache/distributed/dht/GridDhtLockResponse.java | 2 +- .../cache/distributed/dht/GridDhtTxFinishRequest.java | 2 +- .../cache/distributed/dht/GridDhtTxFinishResponse.java | 2 +- .../cache/distributed/dht/GridDhtTxPrepareRequest.java | 2 +- .../distributed/dht/GridDhtTxPrepareResponse.java | 2 +- .../cache/distributed/dht/GridDhtUnlockRequest.java | 2 +- .../atomic/GridDhtAtomicDeferredUpdateResponse.java | 2 +- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 2 +- .../dht/atomic/GridDhtAtomicUpdateResponse.java | 2 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 2 +- .../dht/atomic/GridNearAtomicUpdateResponse.java | 2 +- .../dht/preloader/GridDhtForceKeysRequest.java | 2 +- .../dht/preloader/GridDhtForceKeysResponse.java | 2 +- .../dht/preloader/GridDhtPartitionDemandMessage.java | 2 +- .../dht/preloader/GridDhtPartitionExchangeId.java | 2 +- .../dht/preloader/GridDhtPartitionSupplyMessage.java | 2 +- .../preloader/GridDhtPartitionsAbstractMessage.java | 2 +- .../dht/preloader/GridDhtPartitionsFullMessage.java | 2 +- .../dht/preloader/GridDhtPartitionsSingleMessage.java | 2 +- .../dht/preloader/GridDhtPartitionsSingleRequest.java | 2 +- .../cache/distributed/near/CacheVersionedValue.java | 2 +- .../cache/distributed/near/GridNearGetRequest.java | 2 +- .../cache/distributed/near/GridNearGetResponse.java | 2 +- .../cache/distributed/near/GridNearLockRequest.java | 2 +- .../cache/distributed/near/GridNearLockResponse.java | 2 +- .../distributed/near/GridNearTxFinishRequest.java | 2 +- .../distributed/near/GridNearTxFinishResponse.java | 2 +- .../distributed/near/GridNearTxPrepareRequest.java | 2 +- .../distributed/near/GridNearTxPrepareResponse.java | 2 +- .../cache/distributed/near/GridNearUnlockRequest.java | 2 +- .../processors/cache/query/GridCacheQueryRequest.java | 2 +- .../processors/cache/query/GridCacheQueryResponse.java | 2 +- .../processors/cache/query/GridCacheSqlQuery.java | 9 ++++++--- .../query/continuous/CacheContinuousQueryEntry.java | 2 +- .../processors/cache/transactions/IgniteTxEntry.java | 2 +- .../processors/cache/transactions/IgniteTxKey.java | 2 +- .../cache/transactions/TxEntryValueHolder.java | 2 +- .../cache/version/GridCacheRawVersionedEntry.java | 2 +- .../processors/cache/version/GridCacheVersion.java | 2 +- .../processors/cache/version/GridCacheVersionEx.java | 2 +- .../clock/GridClockDeltaSnapshotMessage.java | 2 +- .../processors/clock/GridClockDeltaVersion.java | 2 +- .../processors/continuous/GridContinuousMessage.java | 2 +- .../processors/datastreamer/DataStreamerEntry.java | 2 +- .../processors/datastreamer/DataStreamerRequest.java | 2 +- .../processors/datastreamer/DataStreamerResponse.java | 2 +- .../internal/processors/igfs/IgfsAckMessage.java | 2 +- .../ignite/internal/processors/igfs/IgfsBlockKey.java | 2 +- .../internal/processors/igfs/IgfsBlocksMessage.java | 2 +- .../processors/igfs/IgfsCommunicationMessage.java | 2 +- .../internal/processors/igfs/IgfsDeleteMessage.java | 2 +- .../processors/igfs/IgfsFileAffinityRange.java | 9 ++++++--- .../processors/igfs/IgfsFragmentizerRequest.java | 2 +- .../processors/igfs/IgfsFragmentizerResponse.java | 2 +- .../internal/processors/igfs/IgfsSyncMessage.java | 2 +- .../h2/twostep/messages/GridQueryCancelRequest.java | 2 +- .../h2/twostep/messages/GridQueryFailResponse.java | 2 +- .../h2/twostep/messages/GridQueryNextPageRequest.java | 2 +- .../h2/twostep/messages/GridQueryNextPageResponse.java | 3 ++- .../query/h2/twostep/messages/GridQueryRequest.java | 3 ++- .../rest/handlers/task/GridTaskResultRequest.java | 2 +- .../rest/handlers/task/GridTaskResultResponse.java | 2 +- .../apache/ignite/internal/util/GridByteArrayList.java | 2 +- .../org/apache/ignite/internal/util/GridLongList.java | 2 +- .../spi/collision/jobstealing/JobStealingRequest.java | 2 +- 108 files changed, 127 insertions(+), 120 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 37e484e..cdbbd9e 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 @@ -343,8 +343,6 @@ public class MessageCodeGenerator { if (cls.isAnnotationPresent(IgniteCodeGeneratingFail.class)) throw new IllegalStateException("@IgniteCodeGeneratingFail is provided for class: " + cls.getName()); - boolean abs = Modifier.isAbstract(cls.getModifiers()); - write.clear(); read.clear(); @@ -379,8 +377,8 @@ public class MessageCodeGenerator { indent--; - finish(write, false); - finish(read, !abs); + finish(write, null); + finish(read, cls.getSimpleName()); } /** @@ -469,7 +467,7 @@ public class MessageCodeGenerator { /** * @param code Code lines. */ - private void finish(Collection<String> code, boolean read) { + private void finish(Collection<String> code, String readClsName) { assert code != null; if (!fields.isEmpty()) { @@ -477,7 +475,10 @@ public class MessageCodeGenerator { code.add(EMPTY); } - code.add(builder().a(read ? "return reader.afterMessageRead();" : "return true;").toString()); + if (readClsName == null) + code.add(builder().a("return true;").toString()); + else + code.add(builder().a("return reader.afterMessageRead(").a(readClsName).a(".class);").toString()); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 49f8c7b..9766171 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 @@ -178,7 +178,7 @@ public class GridJobCancelRequest implements Message { } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridJobCancelRequest.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 83a52ce..667f620 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 @@ -738,7 +738,7 @@ public class GridJobExecuteRequest implements Message { } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridJobExecuteRequest.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 b863993..be1f929 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 @@ -329,7 +329,7 @@ public class GridJobExecuteResponse implements Message { } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridJobExecuteResponse.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 4198d46..71fe5a7 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 @@ -138,7 +138,7 @@ public class GridJobSiblingsRequest implements Message { } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridJobSiblingsRequest.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 9b4d566..6ca0586 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 @@ -117,7 +117,7 @@ public class GridJobSiblingsResponse implements Message { } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridJobSiblingsResponse.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 cabfea5..32e082f 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 @@ -101,7 +101,7 @@ public class GridTaskCancelRequest implements Message { } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridTaskCancelRequest.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 ee6bbf3..42e1506 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 @@ -166,7 +166,7 @@ public class GridTaskSessionRequest implements Message { } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridTaskSessionRequest.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 0b5ffae..fdc3ee6 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 @@ -152,7 +152,7 @@ public class GridCheckpointRequest implements Message { } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridCheckpointRequest.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 c57e78f..844b62b 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 @@ -302,7 +302,7 @@ public class GridIoMessage implements Message { } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridIoMessage.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 affa70f..dff4197 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 @@ -331,7 +331,7 @@ public class GridIoUserMessage implements Message { } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridIoUserMessage.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 d916840..28ad0aa 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 @@ -237,7 +237,7 @@ public class GridDeploymentInfoBean implements Message, GridDeploymentInfo, Exte } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridDeploymentInfoBean.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 ab8b4f6..1eec2c3 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 @@ -252,7 +252,7 @@ public class GridDeploymentRequest implements Message { } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridDeploymentRequest.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 99b7b11..f91bf27 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 @@ -174,7 +174,7 @@ public class GridDeploymentResponse implements Message { } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridDeploymentResponse.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 e12cbee..dc80832 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 @@ -417,7 +417,7 @@ public class GridEventStorageMessage implements Message { } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridEventStorageMessage.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/AffinityTopologyVersion.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/AffinityTopologyVersion.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/AffinityTopologyVersion.java index 4d64d6a..40dc64d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/AffinityTopologyVersion.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/AffinityTopologyVersion.java @@ -177,7 +177,7 @@ public class AffinityTopologyVersion implements Comparable<AffinityTopologyVersi } - return reader.afterMessageRead(null); + return reader.afterMessageRead(AffinityTopologyVersion.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryInfoCollection.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryInfoCollection.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryInfoCollection.java index 65dba59..e346ec2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryInfoCollection.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryInfoCollection.java @@ -96,7 +96,7 @@ public class CacheEntryInfoCollection implements Message { } - return reader.afterMessageRead(null); + return reader.afterMessageRead(CacheEntryInfoCollection.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateAdapter.java index c5b20b4..6253fcf 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateAdapter.java @@ -64,7 +64,7 @@ public abstract class CacheEntryPredicateAdapter implements CacheEntryPredicate if (!reader.beforeMessageRead()) return false; - return true; + return reader.afterMessageRead(CacheEntryPredicateAdapter.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateContainsValue.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateContainsValue.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateContainsValue.java index 3a74e83..03ff850 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateContainsValue.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateContainsValue.java @@ -118,7 +118,7 @@ public class CacheEntryPredicateContainsValue extends CacheEntryPredicateAdapter } - return reader.afterMessageRead(null); + return reader.afterMessageRead(CacheEntryPredicateContainsValue.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntrySerializablePredicate.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntrySerializablePredicate.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntrySerializablePredicate.java index 539455c..23ec70a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntrySerializablePredicate.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntrySerializablePredicate.java @@ -137,7 +137,7 @@ public class CacheEntrySerializablePredicate implements CacheEntryPredicate { } - return reader.afterMessageRead(null); + return reader.afterMessageRead(CacheEntrySerializablePredicate.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictionEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictionEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictionEntry.java index 86e263f..434a241 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictionEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictionEntry.java @@ -172,7 +172,7 @@ public class CacheEvictionEntry implements Message { } - return reader.afterMessageRead(null); + return reader.afterMessageRead(CacheEvictionEntry.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java index f00f435..7b3a998e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java @@ -198,7 +198,7 @@ public class CacheInvokeDirectResult implements Message { } - return reader.afterMessageRead(null); + return reader.afterMessageRead(CacheInvokeDirectResult.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectAdapter.java index 173483d..6b2f46d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectAdapter.java @@ -80,7 +80,7 @@ public abstract class CacheObjectAdapter implements CacheObject, Externalizable } - return true; + return reader.afterMessageRead(CacheObjectAdapter.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectByteArrayImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectByteArrayImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectByteArrayImpl.java index b4b680f..ecd4c43 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectByteArrayImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectByteArrayImpl.java @@ -126,7 +126,7 @@ public class CacheObjectByteArrayImpl implements CacheObject, Externalizable { } - return reader.afterMessageRead(null); + return reader.afterMessageRead(CacheObjectByteArrayImpl.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java index 7673f78..3303cfc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java @@ -317,7 +317,7 @@ public class GridCacheEntryInfo implements Message { } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridCacheEntryInfo.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 b799198..3097114 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 @@ -220,7 +220,7 @@ public class GridCacheEvictionRequest extends GridCacheMessage implements GridCa } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridCacheEvictionRequest.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 ab2c0e7..94a3e60 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 @@ -198,7 +198,7 @@ public class GridCacheEvictionResponse extends GridCacheMessage { } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridCacheEvictionResponse.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 8ebce35..67ac33d 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 @@ -635,7 +635,7 @@ public abstract class GridCacheMessage implements Message { } - return true; + return reader.afterMessageRead(GridCacheMessage.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheReturn.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheReturn.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheReturn.java index cee0eac..073dd2e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheReturn.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheReturn.java @@ -425,7 +425,7 @@ public class GridCacheReturn implements Externalizable, Message { } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridCacheReturn.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 c192699..4c98c73 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 @@ -304,7 +304,7 @@ public class GridCacheTtlUpdateRequest extends GridCacheMessage { } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridCacheTtlUpdateRequest.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryRequest.java index f7474fa..07aecee 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryRequest.java @@ -241,7 +241,7 @@ public class GridCacheTxRecoveryRequest extends GridDistributedBaseMessage { } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridCacheTxRecoveryRequest.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryResponse.java index 658896e..6218da6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryResponse.java @@ -162,7 +162,7 @@ public class GridCacheTxRecoveryResponse extends GridDistributedBaseMessage { } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridCacheTxRecoveryResponse.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 7b84f32..3292583 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 @@ -275,7 +275,7 @@ public abstract class GridDistributedBaseMessage extends GridCacheMessage implem } - return true; + return reader.afterMessageRead(GridDistributedBaseMessage.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 093d123..8bcf813 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 @@ -525,7 +525,7 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage { } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridDistributedLockRequest.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 337eb49..de5eb63 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 @@ -303,7 +303,7 @@ public class GridDistributedLockResponse extends GridDistributedBaseMessage { } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridDistributedLockResponse.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 1901f7a..63f7f16 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 @@ -408,7 +408,7 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage { } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridDistributedTxFinishRequest.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 4641822..88b8c71 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 @@ -134,7 +134,7 @@ public class GridDistributedTxFinishResponse extends GridCacheMessage { } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridDistributedTxFinishResponse.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 b3f85e0..25f267d 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 @@ -575,7 +575,7 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridDistributedTxPrepareRequest.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 19a36fe..0f74780 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 @@ -151,7 +151,7 @@ public class GridDistributedTxPrepareResponse extends GridDistributedBaseMessage } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridDistributedTxPrepareResponse.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 d581dae..a88ca6b 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 @@ -138,7 +138,7 @@ public class GridDistributedUnlockRequest extends GridDistributedBaseMessage { } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridDistributedUnlockRequest.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 352dd8c..c3025e3 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 @@ -125,7 +125,7 @@ public class GridDhtAffinityAssignmentRequest extends GridCacheMessage { } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridDhtAffinityAssignmentRequest.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 a1cf52a..67919b3 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 @@ -199,7 +199,7 @@ public class GridDhtAffinityAssignmentResponse extends GridCacheMessage { } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridDhtAffinityAssignmentResponse.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 8064f1d..de4c9ef 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 @@ -465,9 +465,7 @@ public class GridDhtLockRequest extends GridDistributedLockRequest { reader.incrementState(); case 25: - ownedValues = reader.readObjectArray("ownedValues", - MessageCollectionItemType.MSG, - GridCacheVersion.class); + ownedValues = reader.readObjectArray("ownedValues", MessageCollectionItemType.MSG, GridCacheVersion.class); if (!reader.isLastRead()) return false; @@ -508,7 +506,7 @@ public class GridDhtLockRequest extends GridDistributedLockRequest { } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridDhtLockRequest.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 55abb08..505a63c 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 @@ -268,7 +268,7 @@ public class GridDhtLockResponse extends GridDistributedLockResponse { } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridDhtLockResponse.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 b35c822..f2b5317 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 @@ -385,7 +385,7 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest { } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridDhtTxFinishRequest.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 658b4b2..c6ac483 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 @@ -115,7 +115,7 @@ public class GridDhtTxFinishResponse extends GridDistributedTxFinishResponse { } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridDhtTxFinishResponse.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 fa2272b..7a7769d 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 @@ -533,7 +533,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridDhtTxPrepareRequest.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 441c0f8..da03521 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 @@ -345,7 +345,7 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse { } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridDhtTxPrepareResponse.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 4a4b361..eedcdb4 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 @@ -142,7 +142,7 @@ public class GridDhtUnlockRequest extends GridDistributedUnlockRequest { } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridDhtUnlockRequest.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 29e19d2..db14b3d 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 @@ -119,7 +119,7 @@ public class GridDhtAtomicDeferredUpdateResponse extends GridCacheMessage implem } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridDhtAtomicDeferredUpdateResponse.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 8eee045..514ab5b 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 @@ -884,7 +884,7 @@ public class GridDhtAtomicUpdateRequest extends GridCacheMessage implements Grid } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridDhtAtomicUpdateRequest.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 bfc90d2..8a2befb 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 @@ -262,7 +262,7 @@ public class GridDhtAtomicUpdateResponse extends GridCacheMessage implements Gri } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridDhtAtomicUpdateResponse.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 37bac29..670995b 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 @@ -921,7 +921,7 @@ public class GridNearAtomicUpdateRequest extends GridCacheMessage implements Gri } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridNearAtomicUpdateRequest.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 13f8d19..3bf99c0 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 @@ -602,7 +602,7 @@ public class GridNearAtomicUpdateResponse extends GridCacheMessage implements Gr } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridNearAtomicUpdateResponse.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 bd76ecc..83d139c 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 @@ -242,7 +242,7 @@ public class GridDhtForceKeysRequest extends GridCacheMessage implements GridCac } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridDhtForceKeysRequest.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 75f9b44..8bb6b3a 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 @@ -288,7 +288,7 @@ public class GridDhtForceKeysResponse extends GridCacheMessage implements GridCa } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridDhtForceKeysResponse.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 798d5f7..4beee06 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 @@ -308,7 +308,7 @@ public class GridDhtPartitionDemandMessage extends GridCacheMessage { } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridDhtPartitionDemandMessage.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 f304d6b..3320d62 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 @@ -217,7 +217,7 @@ public class GridDhtPartitionExchangeId implements Message, Comparable<GridDhtPa } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridDhtPartitionExchangeId.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 7c4d1fc..bda526b 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 @@ -374,7 +374,7 @@ public class GridDhtPartitionSupplyMessage extends GridCacheMessage implements G } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridDhtPartitionSupplyMessage.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 5a8616d..ff40daa 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 @@ -140,7 +140,7 @@ abstract class GridDhtPartitionsAbstractMessage extends GridCacheMessage { } - return true; + return reader.afterMessageRead(GridDhtPartitionsAbstractMessage.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 1e4709a..c285215 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 @@ -180,7 +180,7 @@ public class GridDhtPartitionsFullMessage extends GridDhtPartitionsAbstractMessa } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridDhtPartitionsFullMessage.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 89f4c6c..d9633d2 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 @@ -170,7 +170,7 @@ public class GridDhtPartitionsSingleMessage extends GridDhtPartitionsAbstractMes } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridDhtPartitionsSingleMessage.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 e868779..0b443f8 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 @@ -71,7 +71,7 @@ public class GridDhtPartitionsSingleRequest extends GridDhtPartitionsAbstractMes if (!super.readFrom(buf, reader)) return false; - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridDhtPartitionsSingleRequest.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/CacheVersionedValue.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/CacheVersionedValue.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/CacheVersionedValue.java index 75941e6..745ca17 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/CacheVersionedValue.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/CacheVersionedValue.java @@ -149,7 +149,7 @@ public class CacheVersionedValue implements Message { } - return reader.afterMessageRead(null); + return reader.afterMessageRead(CacheVersionedValue.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 146eba4..4b52e69 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 @@ -461,7 +461,7 @@ public class GridNearGetRequest extends GridCacheMessage implements GridCacheDep } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridNearGetRequest.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 e649939..25a6969 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 @@ -331,7 +331,7 @@ public class GridNearGetResponse extends GridCacheMessage implements GridCacheDe } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridNearGetResponse.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 5d2bb67..4440e89 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 @@ -577,7 +577,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest { } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridNearLockRequest.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 7ff5276..110501b 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 @@ -307,7 +307,7 @@ public class GridNearLockResponse extends GridDistributedLockResponse { } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridNearLockResponse.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 c2e6f62..5730357 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 @@ -271,7 +271,7 @@ public class GridNearTxFinishRequest extends GridDistributedTxFinishRequest { } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridNearTxFinishRequest.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 c7dc487..84f4f46 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 @@ -188,7 +188,7 @@ public class GridNearTxFinishResponse extends GridDistributedTxFinishResponse { } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridNearTxFinishResponse.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 7c88a2c..f018d18 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 @@ -470,7 +470,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest { } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridNearTxPrepareRequest.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 650ac68..6f8e334 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 @@ -514,7 +514,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridNearTxPrepareResponse.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 366b337..14f468f 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 @@ -73,7 +73,7 @@ public class GridNearUnlockRequest extends GridDistributedUnlockRequest { if (!super.readFrom(buf, reader)) return false; - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridNearUnlockRequest.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 9793858..76ddebd 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 @@ -732,7 +732,7 @@ public class GridCacheQueryRequest extends GridCacheMessage implements GridCache } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridCacheQueryRequest.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/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 bc7180e..95f7dfa 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 @@ -318,7 +318,7 @@ public class GridCacheQueryResponse extends GridCacheMessage implements GridCach } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridCacheQueryResponse.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java index d63331c..c0db018 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java @@ -55,6 +55,9 @@ public class GridCacheSqlQuery implements Message { @GridDirectTransient private LinkedHashMap<String, ?> cols; + /** Field kept for backward compatibility. */ + private String alias; + /** * For {@link Message}. */ @@ -149,7 +152,7 @@ public class GridCacheSqlQuery implements Message { switch (writer.state()) { case 0: - if (!writer.writeString("alias", null)) + if (!writer.writeString("alias", alias)) return false; writer.incrementState(); @@ -180,7 +183,7 @@ public class GridCacheSqlQuery implements Message { switch (reader.state()) { case 0: - reader.readString("alias"); + alias = reader.readString("alias"); if (!reader.isLastRead()) return false; @@ -205,7 +208,7 @@ public class GridCacheSqlQuery implements Message { } - return reader.afterMessageRead(null); + return reader.afterMessageRead(GridCacheSqlQuery.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java index 7670745..02ec7ac 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java @@ -279,7 +279,7 @@ public class CacheContinuousQueryEntry implements GridCacheDeployable, Message { } - return reader.afterMessageRead(null); + return reader.afterMessageRead(CacheContinuousQueryEntry.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java index c94e3dd..e7a11d0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java @@ -987,7 +987,7 @@ public class IgniteTxEntry implements GridPeerDeployAware, Message { } - return reader.afterMessageRead(null); + return reader.afterMessageRead(IgniteTxEntry.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/86e3b27f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxKey.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxKey.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxKey.java index 17ec239..bbb7559 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxKey.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxKey.java @@ -167,7 +167,7 @@ public class IgniteTxKey implements Message { } - return reader.afterMessageRead(null); + return reader.afterMessageRead(IgniteTxKey.class); } /** {@inheritDoc} */