#ignite-758: rename field prj to opCtx in GridCacheProxyImpl.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b2b56567 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b2b56567 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b2b56567 Branch: refs/heads/ignite-737 Commit: b2b565676b07bc23185d67f447221c6a4cdfbd77 Parents: 343124e Author: ivasilinets <ivasilin...@gridgain.com> Authored: Fri Apr 17 11:27:06 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Fri Apr 17 11:27:06 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheProxyImpl.java | 266 +++++++++---------- 1 file changed, 133 insertions(+), 133 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b2b56567/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 03bdf43..4c756cd 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 @@ -58,7 +58,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** Projection. */ @GridToStringExclude - private CacheOperationContext prj; + private CacheOperationContext opCtx; /** Affinity. */ private Affinity<K> aff; @@ -73,16 +73,16 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** * @param ctx Context. * @param delegate Delegate object. - * @param prj Optional projection which will be passed to gateway. + * @param opCtx Optional operation context which will be passed to gateway. */ public GridCacheProxyImpl(GridCacheContext<K, V> ctx, IgniteInternalCache<K, V> delegate, - @Nullable CacheOperationContext prj) { + @Nullable CacheOperationContext opCtx) { assert ctx != null; assert delegate != null; this.ctx = ctx; this.delegate = delegate; - this.prj = prj; + this.opCtx = opCtx; gate = ctx.gate(); @@ -107,7 +107,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte * @return Gateway projection. */ public CacheOperationContext gateProjection() { - return prj; + return opCtx; } /** {@inheritDoc} */ @@ -122,10 +122,10 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public boolean skipStore() { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { - return prj.skipStore(); + return opCtx.skipStore(); } finally { gate.leave(prev); @@ -144,7 +144,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public CacheMetrics metrics() { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.metrics(); @@ -156,7 +156,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public CacheMetricsMXBean mxBean() { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.mxBean(); @@ -168,7 +168,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public long overflowSize() throws IgniteCheckedException { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.overflowSize(); @@ -180,7 +180,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public void localLoadCache(IgniteBiPredicate<K, V> p, @Nullable Object[] args) throws IgniteCheckedException { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { delegate.localLoadCache(p, args); @@ -192,7 +192,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public IgniteInternalFuture<?> localLoadCacheAsync(IgniteBiPredicate<K, V> p, @Nullable Object[] args) { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.localLoadCacheAsync(p, args); @@ -204,18 +204,18 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public GridCacheProxyImpl<K, V> forSubjectId(UUID subjId) { - return new GridCacheProxyImpl<>(ctx, delegate, prj.forSubjectId(subjId)); + return new GridCacheProxyImpl<>(ctx, delegate, opCtx.forSubjectId(subjId)); } /** {@inheritDoc} */ @Override public GridCacheProxyImpl<K, V> setSkipStore(boolean skipStore) { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { - if (prj.skipStore() == skipStore) + if (opCtx.skipStore() == skipStore) return this; - return new GridCacheProxyImpl<>(ctx, delegate, prj.setSkipStore(skipStore)); + return new GridCacheProxyImpl<>(ctx, delegate, opCtx.setSkipStore(skipStore)); } finally { gate.leave(prev); @@ -224,10 +224,10 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public <K1, V1> GridCacheProxyImpl<K1, V1> keepPortable() { - if (prj.isKeepPortable()) + if (opCtx.isKeepPortable()) return (GridCacheProxyImpl<K1, V1>)this; - return new GridCacheProxyImpl<>((GridCacheContext<K1, V1>)ctx, (GridCacheAdapter<K1, V1>)delegate, prj.keepPortable()); + return new GridCacheProxyImpl<>((GridCacheContext<K1, V1>)ctx, (GridCacheAdapter<K1, V1>)delegate, opCtx.keepPortable()); } /** {@inheritDoc} */ @@ -237,7 +237,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public boolean containsKey(K key) { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.containsKey(key); @@ -249,7 +249,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public boolean containsKeys(Collection<? extends K> keys) { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.containsKeys(keys); @@ -261,7 +261,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public IgniteInternalFuture<Boolean> containsKeyAsync(K key) { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.containsKeyAsync(key); @@ -273,7 +273,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public IgniteInternalFuture<Boolean> containsKeysAsync(Collection<? extends K> keys) { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.containsKeysAsync(keys); @@ -285,7 +285,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Nullable @Override public V get(K key) throws IgniteCheckedException { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.get(key); @@ -297,10 +297,10 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Nullable @Override public V get(K key, boolean deserializePortable) throws IgniteCheckedException { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { - return delegate.get(key, deserializePortable && !prj.isKeepPortable()); + return delegate.get(key, deserializePortable && !opCtx.isKeepPortable()); } finally { gate.leave(prev); @@ -309,7 +309,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public IgniteInternalFuture<V> getAsync(K key) { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.getAsync(key); @@ -321,10 +321,10 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public IgniteInternalFuture<V> getAsync(K key, boolean deserializePortable) { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { - return delegate.getAsync(key, deserializePortable && !prj.isKeepPortable()); + return delegate.getAsync(key, deserializePortable && !opCtx.isKeepPortable()); } finally { gate.leave(prev); @@ -333,7 +333,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public V getForcePrimary(K key) throws IgniteCheckedException { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.getForcePrimary(key); @@ -345,7 +345,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public IgniteInternalFuture<V> getForcePrimaryAsync(K key) { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.getForcePrimaryAsync(key); @@ -357,7 +357,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Nullable @Override public Map<K, V> getAllOutTx(List<K> keys) throws IgniteCheckedException { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.getAllOutTx(keys); @@ -369,7 +369,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public boolean isIgfsDataCache() { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.isIgfsDataCache(); @@ -381,7 +381,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public long igfsDataSpaceUsed() { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.igfsDataSpaceUsed(); @@ -393,7 +393,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public long igfsDataSpaceMax() { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.igfsDataSpaceMax(); @@ -405,7 +405,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public boolean isMongoDataCache() { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.isMongoDataCache(); @@ -417,7 +417,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public boolean isMongoMetaCache() { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.isMongoMetaCache(); @@ -429,7 +429,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public Map<K, V> getAll(@Nullable Collection<? extends K> keys) throws IgniteCheckedException { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.getAll(keys); @@ -442,10 +442,10 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public Map<K, V> getAll(Collection<? extends K> keys, boolean deserializePortable) throws IgniteCheckedException { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { - return delegate.getAll(keys, deserializePortable && !prj.isKeepPortable()); + return delegate.getAll(keys, deserializePortable && !opCtx.isKeepPortable()); } finally { gate.leave(prev); @@ -454,7 +454,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public IgniteInternalFuture<Map<K, V>> getAllAsync(@Nullable Collection<? extends K> keys) { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.getAllAsync(keys); @@ -467,10 +467,10 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public IgniteInternalFuture<Map<K, V>> getAllAsync(@Nullable Collection<? extends K> keys, boolean deserializePortable) { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { - return delegate.getAllAsync(keys, deserializePortable && !prj.isKeepPortable()); + return delegate.getAllAsync(keys, deserializePortable && !opCtx.isKeepPortable()); } finally { gate.leave(prev); @@ -480,7 +480,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Nullable @Override public V getAndPut(K key, V val) throws IgniteCheckedException { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.getAndPut(key, val); @@ -492,7 +492,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public IgniteInternalFuture<V> getAndPutAsync(K key, V val) { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.getAndPutAsync(key, val); @@ -505,7 +505,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public boolean put(K key, V val) throws IgniteCheckedException { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.put(key, val); @@ -517,7 +517,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public void putAllConflict(Map<KeyCacheObject, GridCacheDrInfo> drMap) throws IgniteCheckedException { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { delegate.putAllConflict(drMap); @@ -530,7 +530,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public IgniteInternalFuture<?> putAllConflictAsync(Map<KeyCacheObject, GridCacheDrInfo> drMap) throws IgniteCheckedException { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.putAllConflictAsync(drMap); @@ -544,7 +544,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte @Override public <T> EntryProcessorResult<T> invoke(K key, EntryProcessor<K, V, T> entryProcessor, Object... args) throws IgniteCheckedException { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.invoke(key, entryProcessor, args); @@ -558,7 +558,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte @Override public <T> IgniteInternalFuture<EntryProcessorResult<T>> invokeAsync(K key, EntryProcessor<K, V, T> entryProcessor, Object... args) { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.invokeAsync(key, entryProcessor, args); @@ -572,7 +572,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte @Override public <T> Map<K, EntryProcessorResult<T>> invokeAll(Set<? extends K> keys, EntryProcessor<K, V, T> entryProcessor, Object... args) throws IgniteCheckedException { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.invokeAll(keys, entryProcessor, args); @@ -587,7 +587,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte Set<? extends K> keys, EntryProcessor<K, V, T> entryProcessor, Object... args) { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.invokeAllAsync(keys, entryProcessor, args); @@ -601,7 +601,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte @Override public <T> Map<K, EntryProcessorResult<T>> invokeAll( Map<? extends K, ? extends EntryProcessor<K, V, T>> map, Object... args) throws IgniteCheckedException { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.invokeAll(map, args); @@ -615,7 +615,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte @Override public <T> IgniteInternalFuture<Map<K, EntryProcessorResult<T>>> invokeAllAsync( Map<? extends K, ? extends EntryProcessor<K, V, T>> map, Object... args) { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.invokeAllAsync(map, args); @@ -627,7 +627,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public IgniteInternalFuture<Boolean> putAsync(K key, V val) { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.putAsync(key, val); @@ -639,7 +639,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Nullable @Override public V getAndPutIfAbsent(K key, V val) throws IgniteCheckedException { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.getAndPutIfAbsent(key, val); @@ -651,7 +651,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public IgniteInternalFuture<V> getAndPutIfAbsentAsync(K key, V val) { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.getAndPutIfAbsentAsync(key, val); @@ -663,7 +663,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public boolean putIfAbsent(K key, V val) throws IgniteCheckedException { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.putIfAbsent(key, val); @@ -675,7 +675,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public IgniteInternalFuture<Boolean> putIfAbsentAsync(K key, V val) { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.putIfAbsentAsync(key, val); @@ -687,7 +687,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Nullable @Override public V getAndReplace(K key, V val) throws IgniteCheckedException { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.getAndReplace(key, val); @@ -699,7 +699,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public IgniteInternalFuture<V> getAndReplaceAsync(K key, V val) { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.getAndReplaceAsync(key, val); @@ -711,7 +711,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public boolean replace(K key, V val) throws IgniteCheckedException { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.replace(key, val); @@ -723,7 +723,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public IgniteInternalFuture<Boolean> replaceAsync(K key, V val) { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.replaceAsync(key, val); @@ -735,7 +735,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public boolean replace(K key, V oldVal, V newVal) throws IgniteCheckedException { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.replace(key, oldVal, newVal); @@ -747,7 +747,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public IgniteInternalFuture<Boolean> replaceAsync(K key, V oldVal, V newVal) { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.replaceAsync(key, oldVal, newVal); @@ -759,7 +759,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public void putAll(@Nullable Map<? extends K, ? extends V> m) throws IgniteCheckedException { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { delegate.putAll(m); @@ -771,7 +771,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public IgniteInternalFuture<?> putAllAsync(@Nullable Map<? extends K, ? extends V> m) { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.putAllAsync(m); @@ -783,7 +783,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public Set<K> keySet() { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.keySet(); @@ -795,7 +795,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public Set<K> primaryKeySet() { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.primaryKeySet(); @@ -807,7 +807,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public Collection<V> values() { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.values(); @@ -819,7 +819,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public Set<Cache.Entry<K, V>> entrySet() { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.entrySet(); @@ -831,7 +831,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public Set<Cache.Entry<K, V>> entrySet(int part) { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.entrySet(part); @@ -843,7 +843,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public Set<Cache.Entry<K, V>> entrySetx(CacheEntryPredicate... filter) { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.entrySetx(filter); @@ -855,7 +855,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public IgniteInternalTx txStartEx(TransactionConcurrency concurrency, TransactionIsolation isolation) { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.txStartEx(concurrency, isolation); @@ -867,7 +867,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public Transaction txStart(TransactionConcurrency concurrency, TransactionIsolation isolation) { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.txStart(concurrency, isolation); @@ -881,7 +881,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public Transaction txStart(TransactionConcurrency concurrency, TransactionIsolation isolation, long timeout, int txSize) { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.txStart(concurrency, isolation, timeout, txSize); @@ -893,7 +893,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public Transaction tx() { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.tx(); @@ -909,7 +909,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte @Nullable IgniteCacheExpiryPolicy plc) throws IgniteCheckedException { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.localPeek(key, peekModes, plc); @@ -921,7 +921,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public Iterable<Cache.Entry<K, V>> localEntries(CachePeekMode[] peekModes) throws IgniteCheckedException { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.localEntries(peekModes); @@ -933,7 +933,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public boolean evict(K key) { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.evict(key); @@ -945,7 +945,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public void evictAll(@Nullable Collection<? extends K> keys) { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { delegate.evictAll(keys); @@ -957,7 +957,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public void clearLocally() { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { delegate.clearLocally(); @@ -969,7 +969,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public void clear() throws IgniteCheckedException { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { delegate.clear(); @@ -981,7 +981,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public IgniteInternalFuture<?> clearAsync() { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.clearAsync(); @@ -993,7 +993,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public IgniteInternalFuture<?> clearAsync(K key) { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.clearAsync(key); @@ -1005,7 +1005,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public IgniteInternalFuture<?> clearAsync(Set<? extends K> keys) { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.clearAsync(keys); @@ -1017,7 +1017,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public boolean clearLocally(K key) { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.clearLocally(key); @@ -1029,7 +1029,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public void clearLocallyAll(Set<? extends K> keys) { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { delegate.clearLocallyAll(keys); @@ -1041,7 +1041,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public void clear(K key) throws IgniteCheckedException { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { delegate.clear(key); @@ -1053,7 +1053,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public void clearAll(Set<? extends K> keys) throws IgniteCheckedException { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { delegate.clearAll(keys); @@ -1066,7 +1066,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Nullable @Override public V getAndRemove(K key) throws IgniteCheckedException { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.getAndRemove(key); @@ -1078,7 +1078,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public IgniteInternalFuture<V> getAndRemoveAsync(K key) { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.getAndRemoveAsync(key); @@ -1091,7 +1091,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public boolean remove(K key) throws IgniteCheckedException { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.remove(key); @@ -1104,7 +1104,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public void removeAllConflict(Map<KeyCacheObject, GridCacheVersion> drMap) throws IgniteCheckedException { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { delegate.removeAllConflict(drMap); @@ -1118,7 +1118,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte @Override public IgniteInternalFuture<?> removeAllConflictAsync(Map<KeyCacheObject, GridCacheVersion> drMap) throws IgniteCheckedException { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.removeAllConflictAsync(drMap); @@ -1130,7 +1130,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public IgniteInternalFuture<Boolean> removeAsync(K key) { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.removeAsync(key); @@ -1142,7 +1142,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public IgniteInternalFuture<GridCacheReturn> replacexAsync(K key, V oldVal, V newVal) { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.replacexAsync(key, oldVal, newVal); @@ -1154,7 +1154,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public GridCacheReturn replacex(K key, V oldVal, V newVal) throws IgniteCheckedException { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.replacex(key, oldVal, newVal); @@ -1166,7 +1166,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public GridCacheReturn removex(K key, V val) throws IgniteCheckedException { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.removex(key, val); @@ -1178,7 +1178,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public IgniteInternalFuture<GridCacheReturn> removexAsync(K key, V val) { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.removexAsync(key, val); @@ -1190,7 +1190,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public boolean remove(K key, V val) throws IgniteCheckedException { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.remove(key, val); @@ -1202,7 +1202,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public IgniteInternalFuture<Boolean> removeAsync(K key, V val) { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.removeAsync(key, val); @@ -1214,7 +1214,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public void removeAll(@Nullable Collection<? extends K> keys) throws IgniteCheckedException { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { delegate.removeAll(keys); @@ -1226,7 +1226,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public IgniteInternalFuture<?> removeAllAsync(@Nullable Collection<? extends K> keys) { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.removeAllAsync(keys); @@ -1239,7 +1239,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public void removeAll() throws IgniteCheckedException { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { delegate.removeAll(); @@ -1251,7 +1251,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public IgniteInternalFuture<?> removeAllAsync() { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.removeAllAsync(); @@ -1264,7 +1264,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public boolean lock(K key, long timeout) throws IgniteCheckedException { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.lock(key, timeout); @@ -1276,7 +1276,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public IgniteInternalFuture<Boolean> lockAsync(K key, long timeout) { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.lockAsync(key, timeout); @@ -1288,7 +1288,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public boolean lockAll(@Nullable Collection<? extends K> keys, long timeout) throws IgniteCheckedException { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.lockAll(keys, timeout); @@ -1300,7 +1300,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public IgniteInternalFuture<Boolean> lockAllAsync(@Nullable Collection<? extends K> keys, long timeout) { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.lockAllAsync(keys, timeout); @@ -1312,7 +1312,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public void unlock(K key) throws IgniteCheckedException { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { delegate.unlock(key); @@ -1324,7 +1324,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public void unlockAll(@Nullable Collection<? extends K> keys) throws IgniteCheckedException { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { delegate.unlockAll(keys); @@ -1336,7 +1336,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public boolean isLocked(K key) { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.isLocked(key); @@ -1348,7 +1348,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public boolean isLockedByThread(K key) { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.isLockedByThread(key); @@ -1360,7 +1360,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public int size() { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.size(); @@ -1372,7 +1372,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public int size(CachePeekMode[] peekModes) throws IgniteCheckedException { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.size(peekModes); @@ -1384,7 +1384,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public IgniteInternalFuture<Integer> sizeAsync(CachePeekMode[] peekModes) { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.sizeAsync(peekModes); @@ -1396,7 +1396,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public int localSize(CachePeekMode[] peekModes) throws IgniteCheckedException { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.localSize(peekModes); @@ -1408,7 +1408,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public int nearSize() { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.nearSize(); @@ -1420,7 +1420,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public int primarySize() { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.primarySize(); @@ -1432,7 +1432,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public void promoteAll(@Nullable Collection<? extends K> keys) throws IgniteCheckedException { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { delegate.promoteAll(keys); @@ -1444,7 +1444,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public Iterator<Map.Entry<K, V>> swapIterator() throws IgniteCheckedException { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.swapIterator(); @@ -1456,7 +1456,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public Iterator<Map.Entry<K, V>> offHeapIterator() throws IgniteCheckedException { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.offHeapIterator(); @@ -1468,7 +1468,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public long offHeapEntriesCount() { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.offHeapEntriesCount(); @@ -1480,7 +1480,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public long offHeapAllocatedSize() { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.offHeapAllocatedSize(); @@ -1492,7 +1492,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public long swapSize() throws IgniteCheckedException { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.swapSize(); @@ -1504,7 +1504,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public long swapKeys() throws IgniteCheckedException { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.swapKeys(); @@ -1516,7 +1516,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public Iterator<Cache.Entry<K, V>> iterator() { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.iterator(); @@ -1528,7 +1528,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Override public IgniteInternalFuture<?> forceRepartition() { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { return delegate.forceRepartition(); @@ -1542,7 +1542,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte @Override public void writeExternal(ObjectOutput out) throws IOException { out.writeObject(ctx); out.writeObject(delegate); - out.writeObject(prj); + out.writeObject(opCtx); } /** {@inheritDoc} */ @@ -1550,7 +1550,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { ctx = (GridCacheContext<K, V>)in.readObject(); delegate = (GridCacheAdapter<K, V>)in.readObject(); - prj = (CacheOperationContext)in.readObject(); + opCtx = (CacheOperationContext)in.readObject(); gate = ctx.gate(); @@ -1559,15 +1559,15 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @Nullable @Override public ExpiryPolicy expiry() { - return prj.expiry(); + return opCtx.expiry(); } /** {@inheritDoc} */ @Override public GridCacheProxyImpl<K, V> withExpiryPolicy(ExpiryPolicy plc) { - CacheOperationContext prev = gate.enter(prj); + CacheOperationContext prev = gate.enter(opCtx); try { - CacheOperationContext prj0 = prj.withExpiryPolicy(plc); + CacheOperationContext prj0 = opCtx.withExpiryPolicy(plc); return new GridCacheProxyImpl<>(ctx, delegate, prj0); }
