You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2018/12/25 14:24:23 UTC
[50/50] [abbrv] ignite git commit: ignite-601
ignite-601
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/865803b6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/865803b6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/865803b6
Branch: refs/heads/ignite-601
Commit: 865803b66fdb84d9d20ce16d89cd9e399ddb2800
Parents: 62aa742
Author: sboikov <sb...@apache.org>
Authored: Tue Dec 25 17:21:22 2018 +0300
Committer: sboikov <sb...@apache.org>
Committed: Tue Dec 25 17:21:22 2018 +0300
----------------------------------------------------------------------
.../apache/ignite/internal/processors/cache/GridCacheAdapter.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/865803b6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 657b510..27f280b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -3522,6 +3522,9 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
KeyCacheObject cacheKey = ctx.toCacheKeyObject(key);
+ if (ctx.mvcc().isLockedByThread(ctx.txKey(cacheKey), -1))
+ return true;
+
while (true) {
try {
GridCacheEntryEx entry = peekEx(cacheKey);