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 F0D4210CA9 for ; Fri, 17 Apr 2015 11:01:32 +0000 (UTC) Received: (qmail 65527 invoked by uid 500); 17 Apr 2015 11:01:32 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 65460 invoked by uid 500); 17 Apr 2015 11:01:32 -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 65439 invoked by uid 99); 17 Apr 2015 11:01:32 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Apr 2015 11:01:32 +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.164.171.186] (HELO mx1-us-east.apache.org) (54.164.171.186) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Apr 2015 11:01:28 +0000 Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id 88DBA453D2 for ; Fri, 17 Apr 2015 11:01:07 +0000 (UTC) Received: (qmail 64614 invoked by uid 99); 17 Apr 2015 11:01:06 -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; Fri, 17 Apr 2015 11:01:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8814CE031B; Fri, 17 Apr 2015 11:01:06 +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: Fri, 17 Apr 2015 11:01:08 -0000 Message-Id: <711a51a9409e49fda176abba8f726b41@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [03/17] incubator-ignite git commit: #ignite-743: Implement IgniteCacheProxyLockFree. X-Virus-Checked: Checked by ClamAV on apache.org #ignite-743: Implement IgniteCacheProxyLockFree. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a9bd0178 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a9bd0178 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a9bd0178 Branch: refs/heads/ignite-sprint-4 Commit: a9bd0178772fbe785da496ea791bfc984b56b9a5 Parents: 56ef269 Author: ivasilinets Authored: Tue Apr 14 16:18:37 2015 +0300 Committer: ivasilinets Committed: Tue Apr 14 16:18:37 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/IgniteCacheProxy.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9bd0178/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 dcdf0be..d6f4e85 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 @@ -96,7 +96,7 @@ public class IgniteCacheProxy extends AsyncSupportAdapter lockFree() { + public IgniteCacheProxyLockFree lockFree() { return delegate; } @@ -885,8 +885,6 @@ public class IgniteCacheProxy extends AsyncSupportAdapter extends AsyncSupportAdapter)in.readObject(); - prj = (GridCacheProjectionImpl)in.readObject(); + prj = (GridCacheProjectionImpl)delegate.delegate(); gate = delegate.context().gate(); }