#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-737 Commit: ca4af1c84015e362614caca96b5d363b90d5085f Parents: 18dc8f7 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Fri Apr 17 11:19:36 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> 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<K, V> implements IgniteInternalCache<K, V>, 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<K, V> implements IgniteInternalCache<K, V>, 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<K, V> implements IgniteInternalCache<K, V>, 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<K, V> implements IgniteInternalCache<K, V>, 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<K, V> extends AsyncSupportAdapter<IgniteCache<K, V try { CacheOperationContext prev = gate.enter(prjCtx); - boolean deserializePortables = prjCtx == null ? false : prjCtx.deserializePortables(); + boolean deserializePortables = prjCtx == null ? false : !prjCtx.isKeepPortable(); try { if (isAsync()) { @@ -642,7 +642,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V try { CacheOperationContext prev = gate.enter(prjCtx); - boolean deserializePortables = prjCtx == null ? false : prjCtx.deserializePortables(); + boolean deserializePortables = prjCtx == null ? false : !prjCtx.isKeepPortable(); try { if (isAsync()) { @@ -670,7 +670,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V try { CacheOperationContext prev = gate.enter(prjCtx); - boolean deserializePortables = prjCtx == null ? false : prjCtx.deserializePortables(); + boolean deserializePortables = prjCtx == null ? false : !prjCtx.isKeepPortable(); try { if (isAsync()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca4af1c8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java index 046a829..1578d1b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java @@ -2941,7 +2941,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter private boolean deserializePortables(GridCacheContext cacheCtx) { CacheOperationContext opCtx = cacheCtx.operationContextPerCall(); - return opCtx == null || opCtx.deserializePortables(); + return opCtx == null || !opCtx.isKeepPortable(); } /**
