#ignite-51: fix GridDeploymentMessageCountSelfTest.testCacheValueDeploymentOnPut
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e40d5f45 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e40d5f45 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e40d5f45 Branch: refs/heads/ignite-user-req Commit: e40d5f45e205744842f1e09969fcb503a6a66f70 Parents: 5a3afdc Author: ivasilinets <ivasilin...@gridgain.com> Authored: Thu Mar 5 18:10:11 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Thu Mar 5 18:10:11 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/UserCacheObjectImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e40d5f45/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/UserCacheObjectImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/UserCacheObjectImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/UserCacheObjectImpl.java index 4c38f18..8026995 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/UserCacheObjectImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/UserCacheObjectImpl.java @@ -53,6 +53,12 @@ public class UserCacheObjectImpl extends CacheObjectImpl { if (valBytes == null) valBytes = ctx.processor().marshal(ctx, val); + if (ctx.unmarshalValues()) { + Object val = ctx.processor().unmarshal(ctx, valBytes, this.val.getClass().getClassLoader()); + + return new CacheObjectImpl(val, valBytes); + } + return new CacheObjectImpl(null, valBytes); } catch (IgniteCheckedException e) {
