# IGNITE-943 Fix example tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f499cfea Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f499cfea Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f499cfea Branch: refs/heads/ignite-876-2 Commit: f499cfeaf140cf50355be775a79c186102833dfa Parents: d10120d Author: sevdokimov <sevdoki...@gridgain.com> Authored: Fri May 29 20:07:10 2015 +0300 Committer: sevdokimov <sevdoki...@gridgain.com> Committed: Fri May 29 20:07:10 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 10 ++++++++-- .../ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java | 10 ++++++---- 2 files changed, 14 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f499cfea/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 af85050..56fb63f 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 @@ -1614,8 +1614,14 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter implements DiscoverySpi, T U.interrupt(sockTimeoutWorker); U.join(sockTimeoutWorker, log); - if (ipFinder != null) - ipFinder.close(); + if (ipFinder != null) { + try { + ipFinder.close(); + } + catch (Exception e) { + log.error("Failed to close ipFinder", e); + } + } unregisterMBean(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f499cfea/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java index 6cf06ab..45d0816 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java @@ -495,11 +495,13 @@ public class TcpDiscoveryMulticastIpFinder extends TcpDiscoveryVmIpFinder { /** {@inheritDoc} */ @Override public void close() { - for (AddressSender addrSnd : addrSnds) - U.interrupt(addrSnd); + if (addrSnds != null) { + for (AddressSender addrSnd : addrSnds) + U.interrupt(addrSnd); - for (AddressSender addrSnd : addrSnds) - U.join(addrSnd, log); + for (AddressSender addrSnd : addrSnds) + U.join(addrSnd, log); + } } /** {@inheritDoc} */
