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 706BD18F67 for ; Tue, 12 May 2015 11:31:38 +0000 (UTC) Received: (qmail 24254 invoked by uid 500); 12 May 2015 11:31:38 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 24222 invoked by uid 500); 12 May 2015 11:31:38 -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 24213 invoked by uid 99); 12 May 2015 11:31:38 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 May 2015 11:31:38 +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 E34DCC1241 for ; Tue, 12 May 2015 11:31:37 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.771 X-Spam-Level: * X-Spam-Status: No, score=1.771 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, 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-us-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 KLVG2vrI6fcr for ; Tue, 12 May 2015 11:31:37 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id F2BAC286B0 for ; Tue, 12 May 2015 11:31:35 +0000 (UTC) Received: (qmail 20166 invoked by uid 99); 12 May 2015 11:30:20 -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; Tue, 12 May 2015 11:30:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id AF83DE17E1; Tue, 12 May 2015 11:30:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Tue, 12 May 2015 11:30:51 -0000 Message-Id: <915cb2a7bd6045eaa32c71eb302c97a8@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [32/37] incubator-ignite git commit: #ignite-373: Code formatting. #ignite-373: Code formatting. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/24e1d006 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/24e1d006 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/24e1d006 Branch: refs/heads/ignite-373 Commit: 24e1d0061abf63707a4f3680fd4e50838b73dd01 Parents: 2828cb8 Author: ivasilinets Authored: Tue May 12 13:42:47 2015 +0300 Committer: ivasilinets Committed: Tue May 12 13:42:47 2015 +0300 ---------------------------------------------------------------------- .../cache/distributed/GridDistributedCacheAdapter.java | 6 ++++-- .../internal/processors/cache/CacheRemoveAllSelfTest.java | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/24e1d006/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java index 29a806b..bb7ef1b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java @@ -328,7 +328,8 @@ public abstract class GridDistributedCacheAdapter extends GridCacheAdapter try { if (!locPart.isEmpty() && locPart.primary(topVer)) { for (GridDhtCacheEntry o : locPart.entries()) { - if (!ctx.affinity().belongs(ctx.localNode(), locPart.id(), dht.topology().topologyVersion())) + if (!ctx.affinity().belongs(ctx.localNode(), locPart.id(), + dht.topology().topologyVersion())) return false; if (!o.obsoleteOrDeleted()) @@ -341,7 +342,8 @@ public abstract class GridDistributedCacheAdapter extends GridCacheAdapter if (iter != null) { for (Map.Entry e : iter) { - if (!ctx.affinity().belongs(ctx.localNode(), locPart.id(), dht.topology().topologyVersion())) + if (!ctx.affinity().belongs(ctx.localNode(), locPart.id(), + dht.topology().topologyVersion())) return false; dataLdr.removeDataInternal(ctx.toCacheKeyObject(e.getKey())); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/24e1d006/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheRemoveAllSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheRemoveAllSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheRemoveAllSelfTest.java index 1f2f3f6..10476d7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheRemoveAllSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheRemoveAllSelfTest.java @@ -30,9 +30,9 @@ import java.util.concurrent.atomic.*; * Test remove all method. */ public class CacheRemoveAllSelfTest extends GridCacheAbstractSelfTest { - @Override - protected long getTestTimeout() { - return 600000; + /** {@inheritDoc} */ + @Override protected long getTestTimeout() { + return 60000; } /** {@inheritDoc} */