Repository: incubator-ignite Updated Branches: refs/heads/ignite-709_2 f1d4986f6 -> b1953276f
# IGNITE-709 Bug Fix: don't hang discovery worker if failed to unmarshal custom message. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b1953276 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b1953276 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b1953276 Branch: refs/heads/ignite-709_2 Commit: b1953276f49d85ba44c25eeec64263333bd73e7e Parents: f1d4986 Author: sevdokimov <[email protected]> Authored: Fri May 22 16:43:56 2015 +0300 Committer: sevdokimov <[email protected]> Committed: Fri May 22 16:43:56 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java | 2 +- .../java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b1953276/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java index 5be97e7..bed4888 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java @@ -1481,7 +1481,7 @@ public class TcpClientDiscoverySpi extends TcpDiscoverySpiAdapter implements Tcp notifyDiscovery(EVT_DISCOVERY_CUSTOM_EVT, topVer, node, allVisibleNodes(), msgObj); } - catch (IgniteCheckedException e) { + catch (Throwable e) { U.error(log, "Failed to unmarshal discovery custom message.", e); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b1953276/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 bccbcd5..67a562a 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 @@ -4591,7 +4591,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov msg.messageBytes(marsh.marshal(msgObj)); } - catch (IgniteCheckedException e) { + catch (Throwable e) { U.error(log, "Failed to unmarshal discovery custom message.", e); } }
