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 0E218177A1 for ; Fri, 17 Apr 2015 14:36:33 +0000 (UTC) Received: (qmail 19851 invoked by uid 500); 17 Apr 2015 14:36:33 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 19818 invoked by uid 500); 17 Apr 2015 14:36: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 19754 invoked by uid 99); 17 Apr 2015 14:36: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 14:36: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 14:36:27 +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 C1D5345415 for ; Fri, 17 Apr 2015 14:36:06 +0000 (UTC) Received: (qmail 16215 invoked by uid 99); 17 Apr 2015 14:36: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 14:36:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4468CE031B; Fri, 17 Apr 2015 14:36:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akuznetsov@apache.org To: commits@ignite.incubator.apache.org Date: Fri, 17 Apr 2015 14:36:22 -0000 Message-Id: <85ae8b0fe8b444a28d40404ae5d37a90@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [18/50] [abbrv] incubator-ignite git commit: #ignite-743: fix marshalling. X-Virus-Checked: Checked by ClamAV on apache.org #ignite-743: fix marshalling. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8f8119e1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8f8119e1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8f8119e1 Branch: refs/heads/ignite-755 Commit: 8f8119e1573f93e667b04fade5d4fbe758c6b74e Parents: dbcb60a Author: ivasilinets Authored: Wed Apr 15 11:51:48 2015 +0300 Committer: ivasilinets Committed: Wed Apr 15 11:51:48 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/IgniteCacheProxy.java | 2 +- .../internal/processors/cache/IgniteCacheProxyLockFree.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f8119e1/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 d72ed5a..3424c2c 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 @@ -892,7 +892,7 @@ public class IgniteCacheProxy extends AsyncSupportAdapter)in.readObject(); - prj = (GridCacheProjectionImpl) lockFreeCache.delegate(); + prj = lockFreeCache.projection(); gate = lockFreeCache.context().gate(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f8119e1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxyLockFree.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxyLockFree.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxyLockFree.java index 976eeac..8811b35 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxyLockFree.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxyLockFree.java @@ -116,6 +116,10 @@ public class IgniteCacheProxyLockFree extends AsyncSupportAdapter projection() { + return prj; + } + /** {@inheritDoc} */ @Override public CacheMetrics metrics() { return ctx.cache().metrics();