Repository: ignite Updated Branches: refs/heads/ignite-1913 d10fe91ed -> e2a19646f
Ignite-1913 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e2a19646 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e2a19646 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e2a19646 Branch: refs/heads/ignite-1913 Commit: e2a19646f88331434ed17d6446cc3c7a3d7c1546 Parents: d10fe91 Author: Anton Vinogradov <[email protected]> Authored: Wed Nov 18 15:06:23 2015 +0300 Committer: Anton Vinogradov <[email protected]> Committed: Wed Nov 18 15:06:23 2015 +0300 ---------------------------------------------------------------------- .../dht/preloader/GridDhtPartitionMap2.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/e2a19646/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionMap2.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionMap2.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionMap2.java index 4b3d280..6cbc66b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionMap2.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionMap2.java @@ -240,8 +240,14 @@ public class GridDhtPartitionMap2 implements Comparable<GridDhtPartitionMap2>, E assert i == size; - out.writeLong(topologyVersion().topologyVersion()); - out.writeInt(topologyVersion().minorTopologyVersion()); + if (top != null) { + out.writeLong(topologyVersion().topologyVersion()); + out.writeInt(topologyVersion().minorTopologyVersion()); + } + else { + out.writeLong(0); + out.writeInt(0); + } } /** {@inheritDoc} */ @@ -263,7 +269,12 @@ public class GridDhtPartitionMap2 implements Comparable<GridDhtPartitionMap2>, E put(part, GridDhtPartitionState.fromOrdinal(ordinal)); } - top = new AffinityTopologyVersion(in.readLong(), in.readInt()); + long ver = in.readLong(); + int minorVer = in.readInt(); + + if (ver != 0) { + top = new AffinityTopologyVersion(ver, minorVer); + } } /** {@inheritDoc} */
