minor
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6ef24553 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6ef24553 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6ef24553 Branch: refs/heads/master Commit: 6ef245532cec235601a19f00d099edcb7543846c Parents: fdb493e Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Wed Jul 29 17:25:19 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Wed Jul 29 17:25:19 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheProxyImpl.java | 42 ++++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6ef24553/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 cec8c53..3bbd4af 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 @@ -221,8 +221,8 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte @Override public <K1, V1> GridCacheProxyImpl<K1, V1> keepPortable() { if (opCtx != null && opCtx.isKeepPortable()) return (GridCacheProxyImpl<K1, V1>)this; - - return new GridCacheProxyImpl<>((GridCacheContext<K1, V1>)ctx, + + return new GridCacheProxyImpl<>((GridCacheContext<K1, V1>)ctx, (GridCacheAdapter<K1, V1>)delegate, opCtx != null ? opCtx.keepPortable() : new CacheOperationContext(false, null, true, null, false)); } @@ -1486,25 +1486,6 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte } /** {@inheritDoc} */ - @Override public void writeExternal(ObjectOutput out) throws IOException { - out.writeObject(ctx); - out.writeObject(delegate); - out.writeObject(opCtx); - } - - /** {@inheritDoc} */ - @SuppressWarnings({"unchecked"}) - @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { - ctx = (GridCacheContext<K, V>)in.readObject(); - delegate = (GridCacheAdapter<K, V>)in.readObject(); - opCtx = (CacheOperationContext)in.readObject(); - - gate = ctx.gate(); - - aff = new GridCacheAffinityProxy<>(ctx, ctx.cache().affinity()); - } - - /** {@inheritDoc} */ @Nullable @Override public ExpiryPolicy expiry() { return opCtx != null ? opCtx.expiry() : null; } @@ -1523,6 +1504,25 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte } /** {@inheritDoc} */ + @Override public void writeExternal(ObjectOutput out) throws IOException { + out.writeObject(ctx); + out.writeObject(delegate); + out.writeObject(opCtx); + } + + /** {@inheritDoc} */ + @SuppressWarnings({"unchecked"}) + @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { + ctx = (GridCacheContext<K, V>)in.readObject(); + delegate = (IgniteInternalCache<K, V>)in.readObject(); + opCtx = (CacheOperationContext)in.readObject(); + + gate = ctx.gate(); + + aff = new GridCacheAffinityProxy<>(ctx, ctx.cache().affinity()); + } + + /** {@inheritDoc} */ @Override public String toString() { return S.toString(GridCacheProxyImpl.class, this); }
