Repository: ignite Updated Branches: refs/heads/ignite-4811-no-start-ver 30f5fc115 -> 112695b61
tmp Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b30d9897 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b30d9897 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b30d9897 Branch: refs/heads/ignite-4811-no-start-ver Commit: b30d9897ab859dede111832e7448003b85ac1346 Parents: 30f5fc1 Author: sboikov <[email protected]> Authored: Thu Apr 6 13:09:07 2017 +0300 Committer: sboikov <[email protected]> Committed: Thu Apr 6 13:09:07 2017 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheMapEntry.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b30d9897/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 abfc06b..846c633 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 @@ -141,7 +141,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme /** Start version. */ @GridToStringInclude - protected long startVer; + protected final long startVer; /** Version. */ @GridToStringInclude @@ -188,15 +188,15 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme this.hash = hash; this.cctx = cctx; - this.val = cctx.kernalContext().cacheObjects().prepareForCache(val, cctx); + val = cctx.kernalContext().cacheObjects().prepareForCache(val, cctx); -// synchronized (this) { -// value(val); -// } + synchronized (this) { + value(val); + } + + ver = cctx.versions().next(); -// ver = cctx.versions().next(); -// -// startVer = ver.order(); + startVer = ver.order(); } /** {@inheritDoc} */ @@ -294,7 +294,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme * @return {@code True} if start version. */ public boolean isStartVersion() { - return ver == null;//ver.nodeOrder() == cctx.localNode().order() && ver.order() == startVer; + return ver.nodeOrder() == cctx.localNode().order() && ver.order() == startVer; } /** {@inheritDoc} */
