Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 2A78B200C5B for ; Thu, 27 Apr 2017 17:02:40 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 294E9160BBD; Thu, 27 Apr 2017 15:02:40 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id B5DAF160BC1 for ; Thu, 27 Apr 2017 17:02:38 +0200 (CEST) Received: (qmail 22834 invoked by uid 500); 27 Apr 2017 15:02:37 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 22485 invoked by uid 99); 27 Apr 2017 15:02:37 -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; Thu, 27 Apr 2017 15:02:37 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 58117DFBBB; Thu, 27 Apr 2017 15:02:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Date: Thu, 27 Apr 2017 15:02:44 -0000 Message-Id: <4d48448d37e24a1a9dcb2bab38f2f736@git.apache.org> In-Reply-To: <5f51fd9b11424d99a60609be60c128b9@git.apache.org> References: <5f51fd9b11424d99a60609be60c128b9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [09/28] ignite git commit: Fixed IGFS and Memcached examples. archived-at: Thu, 27 Apr 2017 15:02:40 -0000 Fixed IGFS and Memcached examples. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ff13240c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ff13240c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ff13240c Branch: refs/heads/ignite-5075-cacheStart Commit: ff13240c428439327b0de7efd8bad4bc773a093c Parents: f5db974 Author: devozerov Authored: Thu Apr 27 11:45:03 2017 +0300 Committer: devozerov Committed: Thu Apr 27 11:45:03 2017 +0300 ---------------------------------------------------------------------- .../misc/client/memcache/MemcacheRestExample.java | 2 +- .../memcache/MemcacheRestExampleNodeStartup.java | 1 + .../processors/cache/GridCacheProcessor.java | 2 +- modules/core/src/test/config/igfs-loopback.xml | 18 ------------------ modules/core/src/test/config/igfs-shmem.xml | 18 ------------------ 5 files changed, 3 insertions(+), 38 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ff13240c/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExample.java b/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExample.java index eb0e2d4..7913ea6 100644 --- a/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExample.java @@ -52,7 +52,7 @@ public class MemcacheRestExample { System.out.println(); System.out.println(">>> Memcache REST example started."); - IgniteCache cache = ignite.cache(null); + IgniteCache cache = ignite.cache("default"); client = startMemcachedClient(host, port); http://git-wip-us.apache.org/repos/asf/ignite/blob/ff13240c/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java b/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java index 439e042..aa3685e 100644 --- a/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java +++ b/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java @@ -65,6 +65,7 @@ public class MemcacheRestExampleNodeStartup { CacheConfiguration cacheCfg = new CacheConfiguration(); + cacheCfg.setName("default"); cacheCfg.setAtomicityMode(TRANSACTIONAL); cacheCfg.setWriteSynchronizationMode(FULL_SYNC); cacheCfg.setRebalanceMode(SYNC); http://git-wip-us.apache.org/repos/asf/ignite/blob/ff13240c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index a01bac6..8e58856 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@ -708,7 +708,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { * @throws IgniteCheckedException If failed. */ private void registerCache(CacheConfiguration cfg) throws IgniteCheckedException { - assert cfg.getName() != null; + CU.validateCacheName(cfg.getName()); cloneCheckSerializable(cfg); http://git-wip-us.apache.org/repos/asf/ignite/blob/ff13240c/modules/core/src/test/config/igfs-loopback.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/igfs-loopback.xml b/modules/core/src/test/config/igfs-loopback.xml index 7ec5f10..6584348 100644 --- a/modules/core/src/test/config/igfs-loopback.xml +++ b/modules/core/src/test/config/igfs-loopback.xml @@ -53,24 +53,6 @@ Configuration below demonstrates how to setup a IGFS node with file data. --> - - - - - - - - http://git-wip-us.apache.org/repos/asf/ignite/blob/ff13240c/modules/core/src/test/config/igfs-shmem.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/igfs-shmem.xml b/modules/core/src/test/config/igfs-shmem.xml index f6b1790..79aacb8 100644 --- a/modules/core/src/test/config/igfs-shmem.xml +++ b/modules/core/src/test/config/igfs-shmem.xml @@ -53,24 +53,6 @@ Configuration below demonstrates how to setup a IGFS node with file data. --> - - - - - - - -