IGNITE-4621 Hang on broadcast when BinaryUtils.FIELDS_SORTED_ORDER == true
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d22bcf6c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d22bcf6c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d22bcf6c Branch: refs/heads/ignite-1.9 Commit: d22bcf6c72db5122b62e80f7719b22de67190e6a Parents: 83ad094 Author: Anton Vinogradov <[email protected]> Authored: Mon Jan 30 17:18:03 2017 +0300 Committer: Anton Vinogradov <[email protected]> Committed: Thu Feb 2 13:06:16 2017 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/internal/binary/BinaryContext.java | 3 +++ .../java/org/apache/ignite/internal/binary/BinaryTreeMap.java | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/d22bcf6c/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java index 4030ef0..7b21dfb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java @@ -190,6 +190,9 @@ public class BinaryContext { sysClss.add(GridClosureProcessor.C4V2.class.getName()); sysClss.add(GridClosureProcessor.C4MLAV2.class.getName()); + // BinaryUtils.FIELDS_SORTED_ORDER support, since it uses TreeMap at BinaryMetadata. + sysClss.add(BinaryTreeMap.class.getName()); + if (BinaryUtils.wrapTrees()) { sysClss.add(TreeMap.class.getName()); sysClss.add(TreeSet.class.getName()); http://git-wip-us.apache.org/repos/asf/ignite/blob/d22bcf6c/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryTreeMap.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryTreeMap.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryTreeMap.java index 6a7cf9b..3dae8ce 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryTreeMap.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryTreeMap.java @@ -17,6 +17,7 @@ package org.apache.ignite.internal.binary; +import java.io.Serializable; import org.apache.ignite.binary.BinaryObjectException; import org.apache.ignite.binary.BinaryRawReader; import org.apache.ignite.binary.BinaryRawWriter; @@ -32,7 +33,10 @@ import java.util.TreeMap; /** * Binary {@link TreeMap} wrapper. */ -public class BinaryTreeMap implements Binarylizable { +public class BinaryTreeMap implements Binarylizable, Serializable { + /** */ + private static final long serialVersionUID = 0L; + /** Original map. */ private TreeMap map;
