# ignite-835
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ade75f94 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ade75f94 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ade75f94 Branch: refs/heads/ignite-471 Commit: ade75f94f1bb63b13cd3cb997cc7820541994858 Parents: 08360c9 Author: sboikov <sboi...@gridgain.com> Authored: Tue May 12 16:55:43 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Tue May 12 16:55:43 2015 +0300 ---------------------------------------------------------------------- .../distributed/dht/GridDhtTransactionalCacheAdapter.java | 9 ++++----- .../cache/distributed/GridCacheLockAbstractTest.java | 2 -- 2 files changed, 4 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ade75f94/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java index 87026f3..068e8b2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java @@ -174,7 +174,7 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach // Invalidate key in near cache, if any. if (isNearEnabled(cacheCfg)) - obsoleteNearEntry(key, req.version()); + obsoleteNearEntry(key); break; } @@ -291,7 +291,7 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach // Invalidate key in near cache, if any. if (isNearEnabled(cacheCfg)) - obsoleteNearEntry(key, req.version()); + obsoleteNearEntry(key); if (tx != null) { tx.clearEntry(txKey); @@ -1481,12 +1481,11 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach /** * @param key Key - * @param ver Version. */ - private void obsoleteNearEntry(KeyCacheObject key, GridCacheVersion ver) { + private void obsoleteNearEntry(KeyCacheObject key) { GridCacheEntryEx nearEntry = near().peekEx(key); if (nearEntry != null) - nearEntry.markObsolete(ver); + nearEntry.markObsolete(ctx.versions().next()); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ade75f94/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java index ab0f7d0..2fe76e7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java @@ -501,8 +501,6 @@ public abstract class GridCacheLockAbstractTest extends GridCommonAbstractTest { * @throws Throwable If failed. */ public void testLockReentrancy() throws Throwable { - fail("https://issues.apache.org/jira/browse/IGNITE-835";); - Affinity<Integer> aff = ignite1.affinity(null); for (int i = 10; i < 100; i++) {
