Repository: incubator-ignite Updated Branches: refs/heads/ignite-51 f86bbe8b9 -> 1e7408e37
# ignite-51 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1e7408e3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1e7408e3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1e7408e3 Branch: refs/heads/ignite-51 Commit: 1e7408e37a54a668877688ac7ae7db89a775e3dd Parents: f86bbe8 Author: sboikov <semen.boi...@inria.fr> Authored: Sat Mar 7 00:15:06 2015 +0300 Committer: sboikov <semen.boi...@inria.fr> Committed: Sat Mar 7 00:15:06 2015 +0300 ---------------------------------------------------------------------- .../portable/IgniteCacheObjectProcessorAdapter.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1e7408e3/modules/core/src/main/java/org/apache/ignite/internal/processors/portable/IgniteCacheObjectProcessorAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/portable/IgniteCacheObjectProcessorAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/portable/IgniteCacheObjectProcessorAdapter.java index 60eac93..0a90b99 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/portable/IgniteCacheObjectProcessorAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/portable/IgniteCacheObjectProcessorAdapter.java @@ -106,20 +106,16 @@ public abstract class IgniteCacheObjectProcessorAdapter extends GridProcessorAda { assert valPtr != 0; - long ptr = valPtr; + int size = UNSAFE.getInt(valPtr); - int size = UNSAFE.getInt(ptr); + byte type = UNSAFE.getByte(valPtr + 4); - ptr += 4; - - byte type = UNSAFE.getByte(ptr++); - - byte[] bytes = U.copyMemory(ptr, size); + byte[] bytes = U.copyMemory(valPtr + 5, size); if (ctx.kernalContext().config().isPeerClassLoadingEnabled() && ctx.offheapTiered() && type != CacheObjectAdapter.TYPE_BYTE_ARR) { - IgniteUuid valClsLdrId = U.readGridUuid(ptr + size); + IgniteUuid valClsLdrId = U.readGridUuid(valPtr + 5 + size); ClassLoader ldr = valClsLdrId != null ? ctx.deploy().getClassLoader(valClsLdrId) : ctx.deploy().localLoader();
