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 5C479185B5 for ; Mon, 13 Jul 2015 14:15:03 +0000 (UTC) Received: (qmail 72013 invoked by uid 500); 13 Jul 2015 14:15:03 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 71980 invoked by uid 500); 13 Jul 2015 14:15:03 -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 71971 invoked by uid 99); 13 Jul 2015 14:15:03 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 Jul 2015 14:15:03 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id C13681A6EB7 for ; Mon, 13 Jul 2015 14:15:02 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-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 (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id KeLL3-h22Hfv for ; Mon, 13 Jul 2015 14:15:01 +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 33EF924A09 for ; Mon, 13 Jul 2015 14:14:57 +0000 (UTC) Received: (qmail 71771 invoked by uid 99); 13 Jul 2015 14:14:57 -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, 13 Jul 2015 14:14:57 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CA768E04D9; Mon, 13 Jul 2015 14:14:56 +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: Mon, 13 Jul 2015 14:15:03 -0000 Message-Id: <8e689e5344964bd98b755961a6b3b109@git.apache.org> In-Reply-To: <97929862aa414842a78c53d1b6b7a3c1@git.apache.org> References: <97929862aa414842a78c53d1b6b7a3c1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [08/50] [abbrv] incubator-ignite git commit: IGNITE-1026 - Dynamic cache start fixes IGNITE-1026 - Dynamic cache start fixes Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8ff3619b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8ff3619b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8ff3619b Branch: refs/heads/ignite-1099 Commit: 8ff3619bae65018958c61a3299a415e595dd16c4 Parents: 378e344 Author: Valentin Kulichenko Authored: Wed Jul 1 18:51:51 2015 -0700 Committer: Valentin Kulichenko Committed: Wed Jul 1 18:51:51 2015 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/ignite/Ignite.java | 2 +- .../IgniteCacheConfigurationTemplateTest.java | 26 +++----------------- .../cache/IgniteDynamicCacheStartSelfTest.java | 12 ++------- .../IgniteDynamicClientCacheStartSelfTest.java | 5 ++-- 4 files changed, 9 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8ff3619b/modules/core/src/main/java/org/apache/ignite/Ignite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/Ignite.java b/modules/core/src/main/java/org/apache/ignite/Ignite.java index 209946b..7103b1b 100644 --- a/modules/core/src/main/java/org/apache/ignite/Ignite.java +++ b/modules/core/src/main/java/org/apache/ignite/Ignite.java @@ -308,7 +308,7 @@ public interface Ignite extends AutoCloseable { * @param name Cache name. * @return Instance of the cache for the specified name. */ - public IgniteCache cache(@Nullable String name); + @Nullable public IgniteCache cache(@Nullable String name); /** * Gets grid transactions facade. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8ff3619b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationTemplateTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationTemplateTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationTemplateTest.java index 937a3b4..1085411 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationTemplateTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationTemplateTest.java @@ -420,29 +420,9 @@ public class IgniteCacheConfigurationTemplateTest extends GridCommonAbstractTest } }, IllegalStateException.class, null); - GridTestUtils.assertThrows(log, new Callable() { - @Override public Void call() throws Exception { - ignite.cache(TEMPLATE1); - - return null; - } - }, IllegalArgumentException.class, null); - - GridTestUtils.assertThrows(log, new Callable() { - @Override public Void call() throws Exception { - ignite.cache(TEMPLATE2); - - return null; - } - }, IllegalArgumentException.class, null); - - GridTestUtils.assertThrows(log, new Callable() { - @Override public Void call() throws Exception { - ignite.cache(TEMPLATE3); - - return null; - } - }, IllegalArgumentException.class, null); + assertNull(ignite.cache(TEMPLATE1)); + assertNull(ignite.cache(TEMPLATE2)); + assertNull(ignite.cache(TEMPLATE3)); } } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8ff3619b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java index e7b0ba5..cd19703 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java @@ -310,11 +310,7 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest { for (IgniteInternalFuture f : kernal0.context().cache().context().exchange().exchangeFutures()) f.get(); - GridTestUtils.assertThrows(log, new Callable() { - @Override public Object call() throws Exception { - return kernal0.cache(DYNAMIC_CACHE_NAME); - } - }, IllegalArgumentException.class, null); + assertNull(kernal0.cache(DYNAMIC_CACHE_NAME)); GridTestUtils.assertThrows(log, new Callable() { @Override public Object call() throws Exception { @@ -368,11 +364,7 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest { for (IgniteInternalFuture f : kernal0.context().cache().context().exchange().exchangeFutures()) f.get(); - GridTestUtils.assertThrows(log, new Callable() { - @Override public Object call() throws Exception { - return kernal0.cache(DYNAMIC_CACHE_NAME); - } - }, IllegalArgumentException.class, null); + assertNull(kernal0.cache(DYNAMIC_CACHE_NAME)); } } finally { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8ff3619b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicClientCacheStartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicClientCacheStartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicClientCacheStartSelfTest.java index 24935c7..abada13 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicClientCacheStartSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicClientCacheStartSelfTest.java @@ -30,6 +30,7 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.testframework.*; import org.apache.ignite.testframework.junits.common.*; +import javax.cache.*; import java.util.concurrent.*; import static org.apache.ignite.cache.CacheMode.*; @@ -139,7 +140,7 @@ public class IgniteDynamicClientCacheStartSelfTest extends GridCommonAbstractTes return null; } - }, IgniteException.class, null); + }, CacheException.class, null); checkCache(ignite1, cacheName, false, false); @@ -149,7 +150,7 @@ public class IgniteDynamicClientCacheStartSelfTest extends GridCommonAbstractTes return null; } - }, IgniteException.class, null); + }, CacheException.class, null); checkCache(ignite1, cacheName, false, false); }