Repository: ignite Updated Branches: refs/heads/ignite-zk 03799c9c1 -> cf50b1c9e
zk Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cf50b1c9 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cf50b1c9 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cf50b1c9 Branch: refs/heads/ignite-zk Commit: cf50b1c9eaa4c40ad3cb3de890009a91ff9d5eb0 Parents: 03799c9 Author: sboikov <[email protected]> Authored: Tue Nov 28 14:26:42 2017 +0300 Committer: sboikov <[email protected]> Committed: Tue Nov 28 14:26:42 2017 +0300 ---------------------------------------------------------------------- .../spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/cf50b1c9/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java index bf66ed0..9f833f1 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java @@ -768,7 +768,7 @@ public class ZookeeperDiscoveryImpl { evtData.addRemainingAck(joinedNode); // Topology for joined node does not contain joined node. - byte[] dataForJoinedBytes = marshal(dataForJoined); + byte[] dataForJoinedBytes = U.zip(marshal(dataForJoined)); long start = System.currentTimeMillis(); @@ -1129,7 +1129,7 @@ public class ZookeeperDiscoveryImpl { String path = zkPaths.joinEventDataPathForJoined(evtData.eventId()); - ZkJoinEventDataForJoined dataForJoined = unmarshal(state.zkClient.getData(path)); + ZkJoinEventDataForJoined dataForJoined = unmarshalZip(state.zkClient.getData(path)); state.gridStartTime = evtsData.gridStartTime; @@ -1520,6 +1520,12 @@ public class ZookeeperDiscoveryImpl { return marsh.unmarshal(bytes, null); } + private <T> T unmarshalZip(byte[] bytes) throws IgniteCheckedException { + assert bytes != null && bytes.length > 0; + + return U.unmarshalZip(marsh, bytes, null); + } + /** * @param obj Object. * @return Bytes.
