Repository: ignite Updated Branches: refs/heads/ignite-4932 82956636f -> b948e2449
ignite-4932 WIP Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b948e244 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b948e244 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b948e244 Branch: refs/heads/ignite-4932 Commit: b948e24491bd6c3d3729f8ba66c4c3ee3fb580fe Parents: 8295663 Author: sboikov <[email protected]> Authored: Thu Apr 13 11:56:13 2017 +0300 Committer: sboikov <[email protected]> Committed: Thu Apr 13 11:56:13 2017 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheMapEntry.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b948e244/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java index 8e2a8ae..e9ec15c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java @@ -876,6 +876,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme if (readerArgs == null && (expiryPlc == null || !expiryPlc.hasAccessTtl()) && + !isNear() && !retVer && cctx.config().isEagerTtl()) { // Fast heap get without 'synchronized'. @@ -888,13 +889,11 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme if (evt && cctx.events().isRecordable(EVT_CACHE_OBJECT_READ)) { transformClo = EntryProcessorResourceInjectorProxy.unwrap(transformClo); - GridCacheMvcc mvcc = mvccExtras(); - cctx.events().addEvent( partition(), key, tx, - mvcc != null ? mvcc.anyOwner() : null, + null, EVT_CACHE_OBJECT_READ, val0, true,
