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 54E981752E for ; Mon, 6 Apr 2015 10:45:39 +0000 (UTC) Received: (qmail 15307 invoked by uid 500); 6 Apr 2015 10:45:34 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 15238 invoked by uid 500); 6 Apr 2015 10:45:34 -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 15217 invoked by uid 99); 6 Apr 2015 10:45:34 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Apr 2015 10:45:34 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Mon, 06 Apr 2015 10:45:31 +0000 Received: (qmail 13861 invoked by uid 99); 6 Apr 2015 10:45:11 -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; Mon, 06 Apr 2015 10:45:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0783EE10A4; Mon, 6 Apr 2015 10:45:11 +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: Mon, 06 Apr 2015 10:45:18 -0000 Message-Id: <676311b786774c2bab846d188fd21907@git.apache.org> In-Reply-To: <270d8a9f3e8a4dabb093847fa8022f62@git.apache.org> References: <270d8a9f3e8a4dabb093847fa8022f62@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [09/43] incubator-ignite git commit: # ignite-571 minor X-Virus-Checked: Checked by ClamAV on apache.org # ignite-571 minor Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/28072aa2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/28072aa2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/28072aa2 Branch: refs/heads/gg-10036 Commit: 28072aa218f759c092c380a8c1b2a929f7c9a38c Parents: 14a1916 Author: sboikov Authored: Fri Apr 3 14:07:22 2015 +0300 Committer: sboikov Committed: Fri Apr 3 14:07:22 2015 +0300 ---------------------------------------------------------------------- .../near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java | 5 ++--- ...CachePartitionedNearDisabledBasicStoreMultiNodeSelfTest.java | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/28072aa2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java index 43f886d..0b86d52 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java @@ -108,7 +108,7 @@ public class GridCachePartitionedBasicStoreMultiNodeSelfTest extends GridCommonA c.setCacheConfiguration(cc); - c.setNearCacheConfiguration(mode()); + c.setNearCacheConfiguration(nearCacheConfiguration()); return c; } @@ -116,7 +116,7 @@ public class GridCachePartitionedBasicStoreMultiNodeSelfTest extends GridCommonA /** * @return Distribution mode. */ - protected NearCacheConfiguration mode() { + protected NearCacheConfiguration nearCacheConfiguration() { return new NearCacheConfiguration(); } @@ -309,7 +309,6 @@ public class GridCachePartitionedBasicStoreMultiNodeSelfTest extends GridCommonA */ public void testMultipleOperations() throws Exception { IgniteCache cache = jcache(0); - //GridCache cache = cache(0); try (Transaction tx = grid(0).transactions().txStart(OPTIMISTIC, REPEATABLE_READ)) { cache.put(1, "val"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/28072aa2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNearDisabledBasicStoreMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNearDisabledBasicStoreMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNearDisabledBasicStoreMultiNodeSelfTest.java index 00cb260..bfaa255 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNearDisabledBasicStoreMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNearDisabledBasicStoreMultiNodeSelfTest.java @@ -25,7 +25,7 @@ import org.apache.ignite.configuration.*; public class GridCachePartitionedNearDisabledBasicStoreMultiNodeSelfTest extends GridCachePartitionedBasicStoreMultiNodeSelfTest { /** {@inheritDoc} */ - @Override protected NearCacheConfiguration mode() { + @Override protected NearCacheConfiguration nearCacheConfiguration() { return null; } }