Repository: ignite Updated Branches: refs/heads/ignite-3477-debug e7bffb2b1 -> 408995127
.NET - detach Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/40899512 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/40899512 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/40899512 Branch: refs/heads/ignite-3477-debug Commit: 408995127bf3cc669ab0caa7a0221229bc0a1f48 Parents: e7bffb2 Author: Alexey Goncharuk <[email protected]> Authored: Wed Apr 12 18:09:45 2017 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Wed Apr 12 18:09:45 2017 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/internal/binary/BinaryUtils.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/40899512/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java index 51e491e..15cb736 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java @@ -1748,8 +1748,6 @@ public class BinaryUtils { byte flag = in.readByte(); - U.debug("read flag: " + flag); - switch (flag) { case GridBinaryMarshaller.NULL: return null; @@ -1897,8 +1895,14 @@ public class BinaryUtils { case GridBinaryMarshaller.MAP: return doReadMap(in, ctx, ldr, handles, false, null); - case GridBinaryMarshaller.BINARY_OBJ: - return doReadBinaryObject(in, ctx); + case GridBinaryMarshaller.BINARY_OBJ: { + BinaryObject binObj0 = doReadBinaryObject(in, ctx); + + if (detach && binObj0 instanceof BinaryObjectImpl) + binObj0 = ((BinaryObjectImpl)binObj0).detach(); + + return binObj0; + } case GridBinaryMarshaller.ENUM: return doReadBinaryEnum(in, ctx, doReadEnumType(in));
