# Bug fix: Don't throw marshaller exception from collectExchangeData() to avoid ring hang.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/32a2d906 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/32a2d906 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/32a2d906 Branch: refs/heads/ignite-709_3 Commit: 32a2d90645fb3fff8bc4c8753cb71fe451f86036 Parents: e040b54 Author: sevdokimov <sevdoki...@gridgain.com> Authored: Tue May 5 19:05:26 2015 +0300 Committer: sevdokimov <sevdoki...@gridgain.com> Committed: Tue May 5 19:05:26 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/32a2d906/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 5336738..2639a9b 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 @@ -2216,9 +2216,8 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov /** * @param nodeId Node ID. * @return Marshalled exchange data. - * @throws IgniteSpiException If failed. */ - private Map<Integer, byte[]> collectExchangeData(UUID nodeId) throws IgniteSpiException { + private Map<Integer, byte[]> collectExchangeData(UUID nodeId) { Map<Integer, Serializable> data = exchange.collect(nodeId); Map<Integer, byte[]> data0 = null; @@ -2235,8 +2234,6 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov 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); } } }
