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 C5C4B179D8 for ; Thu, 16 Apr 2015 08:31:02 +0000 (UTC) Received: (qmail 44482 invoked by uid 500); 16 Apr 2015 08:30:59 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 44425 invoked by uid 500); 16 Apr 2015 08:30:59 -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 44376 invoked by uid 99); 16 Apr 2015 08:30:59 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Apr 2015 08:30:59 +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; Thu, 16 Apr 2015 08:30:57 +0000 Received: (qmail 42755 invoked by uid 99); 16 Apr 2015 08:30: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, 16 Apr 2015 08:30:37 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8D298E0E1F; Thu, 16 Apr 2015 08:30:37 +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: Thu, 16 Apr 2015 08:30:48 -0000 Message-Id: <70d98769329e49389db24172cf82a8a9@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [12/12] incubator-ignite git commit: #ignite-758: CacheProjectionContext is not Nullable in IgniteCacheProxy. X-Virus-Checked: Checked by ClamAV on apache.org #ignite-758: CacheProjectionContext is not Nullable in IgniteCacheProxy. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/75529399 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/75529399 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/75529399 Branch: refs/heads/ignite-758 Commit: 755293991d709da91c57a24e2622fbecfc50784b Parents: 3811c9a Author: ivasilinets Authored: Thu Apr 16 11:30:21 2015 +0300 Committer: ivasilinets Committed: Thu Apr 16 11:30:21 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheProcessor.java | 6 ++++-- .../ignite/internal/processors/cache/IgniteCacheProxy.java | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/75529399/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 2859061..1353363 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 @@ -735,7 +735,8 @@ public class GridCacheProcessor extends GridProcessorAdapter { startCache(cache); - jCacheProxies.put(maskNull(name), new IgniteCacheProxy(ctx, cache, null, false)); + jCacheProxies.put(maskNull(name), new IgniteCacheProxy(ctx, cache, + new CacheProjectionContext(false, null, false, null), false)); } } @@ -1517,7 +1518,8 @@ public class GridCacheProcessor extends GridProcessorAdapter { String masked = maskNull(cacheCtx.name()); - jCacheProxies.put(masked, new IgniteCacheProxy(cache.context(), cache, null, false)); + jCacheProxies.put(masked, new IgniteCacheProxy(cache.context(), cache, + new CacheProjectionContext(false, null, false, null), false)); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/75529399/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java index c8d3200..408f7f1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java @@ -98,7 +98,7 @@ public class IgniteCacheProxy extends AsyncSupportAdapter ctx, GridCacheAdapter delegate, - @Nullable CacheProjectionContext prjCtx, + CacheProjectionContext prjCtx, boolean async ) { super(async);