Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0CA8D17E1A for ; Mon, 13 Apr 2015 12:23:56 +0000 (UTC) Received: (qmail 19256 invoked by uid 500); 13 Apr 2015 12:23:56 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 19221 invoked by uid 500); 13 Apr 2015 12:23:55 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 19208 invoked by uid 99); 13 Apr 2015 12:23:55 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 Apr 2015 12:23:55 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Mon, 13 Apr 2015 12:23:31 +0000 Received: (qmail 18181 invoked by uid 99); 13 Apr 2015 12:23:29 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 Apr 2015 12:23:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0C3F7E0A57; Mon, 13 Apr 2015 12:23:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.incubator.apache.org Date: Mon, 13 Apr 2015 12:23:29 -0000 Message-Id: In-Reply-To: <3a341a894e514edf9d4104fbed431bc4@git.apache.org> References: <3a341a894e514edf9d4104fbed431bc4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [02/50] incubator-ignite git commit: # ignite-537 X-Virus-Checked: Checked by ClamAV on apache.org # ignite-537 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c85175b7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c85175b7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c85175b7 Branch: refs/heads/ignite-gg-9915 Commit: c85175b7ebaf24c0c1cd3519b4c9889ca7efb071 Parents: 876beff Author: sboikov Authored: Fri Apr 10 20:43:20 2015 +0300 Committer: sboikov Committed: Fri Apr 10 20:43:20 2015 +0300 ---------------------------------------------------------------------- .../spi/discovery/tcp/TcpDiscoverySpi.java | 24 ++++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c85175b7/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java index 117166f..d9cec3c 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java @@ -2328,19 +2328,23 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov private Map collectExchangeData(UUID nodeId) throws IgniteSpiException { Map data = exchange.collect(nodeId); - Map data0 = U.newHashMap(data.size()); + Map data0 = null; - for (Map.Entry entry : data.entrySet()) { - try { - byte[] bytes = marsh.marshal(entry.getValue()); + if (data != null) { + data0 = U.newHashMap(data.size()); - data0.put(entry.getKey(), bytes); - } - catch (IgniteCheckedException e) { - U.error(log, "Failed to marshal discovery data " + - "[comp=" + entry.getKey() + ", data=" + entry.getValue() + ']', e); + for (Map.Entry entry : data.entrySet()) { + try { + byte[] bytes = marsh.marshal(entry.getValue()); - throw new IgniteSpiException("Failed to marshal discovery data.", e); + data0.put(entry.getKey(), bytes); + } + catch (IgniteCheckedException e) { + U.error(log, "Failed to marshal discovery data " + + "[comp=" + entry.getKey() + ", data=" + entry.getValue() + ']', e); + + throw new IgniteSpiException("Failed to marshal discovery data.", e); + } } }