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 DDC0E173A8 for ; Mon, 20 Apr 2015 15:14:56 +0000 (UTC) Received: (qmail 46085 invoked by uid 500); 20 Apr 2015 15:14:53 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 46018 invoked by uid 500); 20 Apr 2015 15:14:53 -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 45967 invoked by uid 99); 20 Apr 2015 15:14:53 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Apr 2015 15:14:53 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: local policy) Received: from [54.191.145.13] (HELO mx1-us-west.apache.org) (54.191.145.13) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Apr 2015 15:14:48 +0000 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 A3387252FC for ; Mon, 20 Apr 2015 15:14:28 +0000 (UTC) Received: (qmail 45338 invoked by uid 99); 20 Apr 2015 15:14:28 -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, 20 Apr 2015 15:14:28 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 71C83E08DB; Mon, 20 Apr 2015 15:14:28 +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, 20 Apr 2015 15:15:04 -0000 Message-Id: <313cb6099dea4a26b1fef93f75fbc6e9@git.apache.org> In-Reply-To: <4c84cc5685914b80967634d579940be6@git.apache.org> References: <4c84cc5685914b80967634d579940be6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [38/50] incubator-ignite git commit: Merge branch 'ignite-758' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-758 X-Virus-Checked: Checked by ClamAV on apache.org Merge branch 'ignite-758' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-758 Conflicts: modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7430e018 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7430e018 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7430e018 Branch: refs/heads/gg-10115 Commit: 7430e018d646b3892dee5c7b8640d7c3acef165b Parents: b6bf81a e99216f Author: ivasilinets Authored: Fri Apr 17 17:14:21 2015 +0300 Committer: ivasilinets Committed: Fri Apr 17 17:14:21 2015 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/GridCacheAdapter.java | 4 +++- .../internal/processors/cache/GridCacheContext.java | 2 +- .../internal/processors/cache/GridCacheProcessor.java | 6 +++--- .../internal/processors/cache/GridCacheProxyImpl.java | 3 ++- .../internal/processors/cache/IgniteCacheProxy.java | 11 +++++------ .../datastreamer/DataStreamerCacheUpdaters.java | 5 ++--- 6 files changed, 16 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7430e018/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7430e018/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java index 2294e8b,22c730b..5487944 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java @@@ -219,11 -217,12 +219,12 @@@ public class GridCacheProxyImpl i /** {@inheritDoc} */ @Override public GridCacheProxyImpl keepPortable() { - if (opCtx.isKeepPortable()) + if (opCtx != null && opCtx.isKeepPortable()) return (GridCacheProxyImpl)this; - return new GridCacheProxyImpl<>((GridCacheContext)ctx, (GridCacheAdapter)delegate, - return new GridCacheProxyImpl<>((GridCacheContext)ctx, ++ return new GridCacheProxyImpl<>((GridCacheContext)ctx, + (GridCacheAdapter)delegate, - opCtx.keepPortable()); + opCtx != null ? opCtx.keepPortable() : new CacheOperationContext(false, null, true, null)); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7430e018/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java ----------------------------------------------------------------------