Repository: ignite Updated Branches: refs/heads/ignite-1758 f2dec6d86 -> b1d27880b
ignite-1758 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b1d27880 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b1d27880 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b1d27880 Branch: refs/heads/ignite-1758 Commit: b1d27880b44bbb41df21f0099185d2efac489227 Parents: f2dec6d Author: sboikov <sboi...@gridgain.com> Authored: Mon Oct 26 11:44:37 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Mon Oct 26 11:44:37 2015 +0300 ---------------------------------------------------------------------- .../cache/distributed/dht/preloader/GridDhtPreloader.java | 4 +--- .../ignite/spi/communication/tcp/TcpCommunicationSpi.java | 4 +++- .../internal/IgniteClientReconnectMassiveShutdownTest.java | 7 ------- 3 files changed, 4 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b1d27880/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java index 74237f8..2df8af8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java @@ -192,9 +192,7 @@ public class GridDhtPreloader extends GridCachePreloaderAdapter { ClusterNode loc = cctx.localNode(); - long startTime = loc.metrics().getStartTime(); - - assert startTime > 0; + assert loc.metrics().getStartTime() > 0; final long startTopVer = loc.order(); http://git-wip-us.apache.org/repos/asf/ignite/blob/b1d27880/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java index c29943c..f457269 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java @@ -1358,7 +1358,9 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter /** {@inheritDoc} */ @Override public int getOutboundMessagesQueueSize() { - return nioSrvr.outboundMessagesQueueSize(); + GridNioServer<Message> srv = nioSrvr; + + return srv != null ? srv.outboundMessagesQueueSize() : 0; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/b1d27880/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectMassiveShutdownTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectMassiveShutdownTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectMassiveShutdownTest.java index ccb1114..5bc6382 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectMassiveShutdownTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectMassiveShutdownTest.java @@ -63,13 +63,6 @@ public class IgniteClientReconnectMassiveShutdownTest extends GridCommonAbstract /** */ private TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); - /** - * @throws Exception If fails. - */ - public IgniteClientReconnectMassiveShutdownTest() throws Exception { - super(false); - } - /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName);
