ignite-471: wrap unmarshalled object with GridPortableObjectImpl when keep portable is used
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/505dc628 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/505dc628 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/505dc628 Branch: refs/heads/ignite-471 Commit: 505dc62865090da61201e96d63f12ee187ba7dc2 Parents: af92d1d Author: Denis Magda <dma...@gridgain.com> Authored: Wed May 13 17:01:29 2015 +0300 Committer: Denis Magda <dma...@gridgain.com> Committed: Wed May 13 17:01:29 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheSwapManager.java | 2 +- .../distributed/dht/preloader/GridDhtForceKeysResponse.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/505dc628/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java index b366ca9..eda57cf 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java @@ -1620,7 +1620,7 @@ public class GridCacheSwapManager extends GridCacheManagerAdapter { int part = cctx.affinity().partition(key); - offheap.removex(spaceName, part, key, key.valueBytes(cctx.cacheObjectContext())); + offheap.removex(spaceName, part, key, key.valueBytes(cctx.cacheObjectContext()).array()); } @Override protected void onClose() throws IgniteCheckedException { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/505dc628/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java index 41ce0be..b4d7243 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java @@ -165,7 +165,7 @@ public class GridDhtForceKeysResponse extends GridCacheMessage implements GridCa info.marshal(cctx); } - errBytes = ctx.marshaller().marshal(err); + errBytes = ctx.marshaller().marshal(err).array(); } /** {@inheritDoc} */ @@ -182,7 +182,7 @@ public class GridDhtForceKeysResponse extends GridCacheMessage implements GridCa info.unmarshal(cctx, ldr); } - err = ctx.marshaller().unmarshal(errBytes, ldr); + err = ctx.marshaller().unmarshal(ByteBuffer.wrap(errBytes), ldr); } /** {@inheritDoc} */
