#ignite-758: Fix marshalling test
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/26368493 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/26368493 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/26368493 Branch: refs/heads/ignite-758 Commit: 26368493d65162960760f322d82476d7ba4a6001 Parents: 5c93698 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Thu Apr 16 11:59:46 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Thu Apr 16 11:59:46 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheProxyImpl.java | 4 ++-- .../ignite/internal/processors/cache/IgniteCacheProxy.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26368493/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 3c4a3c5..4613be7 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 @@ -59,7 +59,7 @@ public class GridCacheProxyImpl<K, V> implements CacheProjection<K, V>, External /** Delegate object. */ @GridToStringExclude - private GridCacheAdapter<K, V> delegate; + private CacheProjection<K, V> delegate; /** Projection. */ @GridToStringExclude @@ -83,7 +83,7 @@ public class GridCacheProxyImpl<K, V> implements CacheProjection<K, V>, External * @param delegate Delegate object. * @param prj Optional projection which will be passed to gateway. */ - public GridCacheProxyImpl(GridCacheContext<K, V> ctx, GridCacheAdapter<K, V> delegate, + public GridCacheProxyImpl(GridCacheContext<K, V> ctx, CacheProjection<K, V> delegate, @Nullable CacheProjectionContext prj) { assert ctx != null; assert delegate != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26368493/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 40afa26..6efd5c7 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 @@ -69,7 +69,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V /** Delegate. */ @GridToStringInclude - private GridCacheAdapter<K, V> delegate; + private CacheProjection<K, V> delegate; /** Projection. */ private CacheProjectionContext prjCtx; @@ -97,7 +97,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V */ public IgniteCacheProxy( GridCacheContext<K, V> ctx, - GridCacheAdapter<K, V> delegate, + CacheProjection<K, V> delegate, CacheProjectionContext prjCtx, boolean async ) { @@ -1491,7 +1491,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { ctx = (GridCacheContext<K, V>)in.readObject(); - delegate = (GridCacheAdapter<K, V>)in.readObject(); + delegate = (CacheProjection<K, V>)in.readObject(); prjCtx = (CacheProjectionContext)in.readObject();
