Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CF4F818510 for ; Wed, 13 May 2015 14:21:15 +0000 (UTC) Received: (qmail 47603 invoked by uid 500); 13 May 2015 14:21:15 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 47572 invoked by uid 500); 13 May 2015 14:21:15 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 47563 invoked by uid 99); 13 May 2015 14:21:15 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 May 2015 14:21:15 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 43D12C2A70 for ; Wed, 13 May 2015 14:21:15 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.771 X-Spam-Level: X-Spam-Status: No, score=0.771 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id LoRWpZEAq_-j for ; Wed, 13 May 2015 14:21:06 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id 1A7932A9FE for ; Wed, 13 May 2015 14:20:55 +0000 (UTC) Received: (qmail 37833 invoked by uid 99); 13 May 2015 14:20:51 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 May 2015 14:20:51 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 68E7DE35AA; Wed, 13 May 2015 14:20:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sevdokimov@apache.org To: commits@ignite.incubator.apache.org Date: Wed, 13 May 2015 14:21:09 -0000 Message-Id: <2f0921ddbf644554978c15dc3c14419f@git.apache.org> In-Reply-To: <9607302d466146e991b27df482e52dbe@git.apache.org> References: <9607302d466146e991b27df482e52dbe@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [19/27] incubator-ignite git commit: # ignite-835 # 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-894 Commit: ade75f94f1bb63b13cd3cb997cc7820541994858 Parents: 08360c9 Author: sboikov Authored: Tue May 12 16:55:43 2015 +0300 Committer: sboikov 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 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 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 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 aff = ignite1.affinity(null); for (int i = 10; i < 100; i++) {