You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by av...@apache.org on 2018/08/03 09:58:42 UTC
[29/50] [abbrv] ignite git commit: IGNITE-9154: Fixed conflict
version passed to events for ATOMIC cache. This closes #4463.
IGNITE-9154: Fixed conflict version passed to events for ATOMIC cache. This closes #4463.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3ea3a560
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3ea3a560
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3ea3a560
Branch: refs/heads/ignite-8446
Commit: 3ea3a560847e36c6aa367e83f3ba3545b6a6d99a
Parents: 4439119
Author: Andrey V. Mashenkov <an...@gmail.com>
Authored: Wed Aug 1 13:23:32 2018 +0300
Committer: devozerov <pp...@gmail.com>
Committed: Wed Aug 1 13:23:32 2018 +0300
----------------------------------------------------------------------
.../internal/processors/cache/GridCacheMapEntry.java | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ea3a560/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 9f9b5c5..90d4c4a 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
@@ -1881,7 +1881,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
key,
evtNodeId,
null,
- newVer,
+ updateVer,
EVT_CACHE_OBJECT_READ,
evtOld, evtOld != null,
evtOld, evtOld != null,
@@ -1908,7 +1908,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
key,
evtNodeId,
null,
- newVer,
+ updateVer,
EVT_CACHE_OBJECT_PUT,
updateVal,
true,
@@ -1925,7 +1925,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
clearReaders();
- drReplicate(drType, null, newVer, topVer);
+ drReplicate(drType, null, updateVer, topVer);
recordNodeId(affNodeId, topVer);
@@ -1936,7 +1936,8 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
cctx.events().addEvent(partition(),
key,
evtNodeId,
- null, newVer,
+ null,
+ updateVer,
EVT_CACHE_OBJECT_REMOVED,
null, false,
evtOld, evtOld != null,
@@ -5046,7 +5047,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
}
}
else {
- newSysTtl = newTtl = conflictCtx.ttl();
+ newSysTtl = newTtl = conflictCtx.ttl();
newSysExpireTime = newExpireTime = conflictCtx.expireTime();
}