Repository: incubator-ignite Updated Branches: refs/heads/ignite-51 ed11001f8 -> c454acf31
#ignite-51: fix GridP2PContinuousDeploymentSelfTest.testDeployment. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7070eb32 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7070eb32 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7070eb32 Branch: refs/heads/ignite-51 Commit: 7070eb326c67658f937ee7981dd6246aa44b10c8 Parents: a06c150 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Fri Mar 6 13:15:44 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Fri Mar 6 13:15:44 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheMessage.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7070eb32/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java index b67ccc6..7c5017f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java @@ -323,8 +323,13 @@ public abstract class GridCacheMessage implements Message { e.marshal(ctx, transferExpiry); if (ctx.deploymentEnabled()) { - prepareObject(e.key(), ctx); - prepareObject(e.value(), ctx); + CacheObjectContext cctx =ctx.cacheContext(e.cacheId()).cacheObjectContext(); + + if (e.key() != null) + prepareObject(e.key().value(cctx, false), ctx); + + if (e.value() != null) + prepareObject(e.value().value(cctx, false), ctx); } } }
