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 99BF41778C for ; Mon, 20 Apr 2015 12:23:12 +0000 (UTC) Received: (qmail 62488 invoked by uid 500); 20 Apr 2015 12:23:12 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 62461 invoked by uid 500); 20 Apr 2015 12:23:12 -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 62452 invoked by uid 99); 20 Apr 2015 12:23:12 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Apr 2015 12:23:12 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: local policy) Received: from [54.76.25.247] (HELO mx1-eu-west.apache.org) (54.76.25.247) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Apr 2015 12:22:47 +0000 Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id 9731625F30 for ; Mon, 20 Apr 2015 12:22:45 +0000 (UTC) Received: (qmail 61884 invoked by uid 99); 20 Apr 2015 12:22:44 -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 12:22:44 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BBEFFE090B; Mon, 20 Apr 2015 12:22:44 +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 12:22:55 -0000 Message-Id: <653af62b34544774a0cca0ae1a55907d@git.apache.org> In-Reply-To: <223a33501bfa497e9274a9709f735283@git.apache.org> References: <223a33501bfa497e9274a9709f735283@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [12/50] incubator-ignite git commit: #ignite-758: remove method deserializePortables. X-Virus-Checked: Checked by ClamAV on apache.org #ignite-758: remove method deserializePortables. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ca4af1c8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ca4af1c8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ca4af1c8 Branch: refs/heads/ignite-656 Commit: ca4af1c84015e362614caca96b5d363b90d5085f Parents: 18dc8f7 Author: ivasilinets Authored: Fri Apr 17 11:19:36 2015 +0300 Committer: ivasilinets Committed: Fri Apr 17 11:19:36 2015 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/CacheOperationContext.java | 7 ------- .../ignite/internal/processors/cache/GridCacheProxyImpl.java | 8 ++++---- .../ignite/internal/processors/cache/IgniteCacheProxy.java | 6 +++--- .../processors/cache/transactions/IgniteTxLocalAdapter.java | 2 +- 4 files changed, 8 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca4af1c8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOperationContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOperationContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOperationContext.java index b9ee1c9..3adf877 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOperationContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOperationContext.java @@ -73,13 +73,6 @@ public class CacheOperationContext implements Serializable { } /** - * @return {@code True} if portables should be deserialized. - */ - public boolean deserializePortables() { - return !keepPortable; - } - - /** * See {@link IgniteInternalCache#keepPortable()}. * * @return New instance of CacheOperationContext with keep portable flag. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca4af1c8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java ---------------------------------------------------------------------- diff --git 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 index ceb60fe..a57c953 100644 --- 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 @@ -297,7 +297,7 @@ public class GridCacheProxyImpl implements IgniteInternalCache, Exte CacheOperationContext prev = gate.enter(prj); try { - return delegate.get(key, deserializePortable && prj.deserializePortables()); + return delegate.get(key, deserializePortable && !prj.isKeepPortable()); } finally { gate.leave(prev); @@ -321,7 +321,7 @@ public class GridCacheProxyImpl implements IgniteInternalCache, Exte CacheOperationContext prev = gate.enter(prj); try { - return delegate.getAsync(key, deserializePortable && prj.deserializePortables()); + return delegate.getAsync(key, deserializePortable && !prj.isKeepPortable()); } finally { gate.leave(prev); @@ -442,7 +442,7 @@ public class GridCacheProxyImpl implements IgniteInternalCache, Exte CacheOperationContext prev = gate.enter(prj); try { - return delegate.getAll(keys, deserializePortable && prj.deserializePortables()); + return delegate.getAll(keys, deserializePortable && !prj.isKeepPortable()); } finally { gate.leave(prev); @@ -467,7 +467,7 @@ public class GridCacheProxyImpl implements IgniteInternalCache, Exte CacheOperationContext prev = gate.enter(prj); try { - return delegate.getAllAsync(keys, deserializePortable && prj.deserializePortables()); + return delegate.getAllAsync(keys, deserializePortable && !prj.isKeepPortable()); } finally { gate.leave(prev); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca4af1c8/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 7c3dac5..da26a27 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 @@ -617,7 +617,7 @@ public class IgniteCacheProxy extends AsyncSupportAdapter extends AsyncSupportAdapter extends AsyncSupportAdapter