Repository: incubator-ignite Updated Branches: refs/heads/ignite-901 c0e62bd58 -> 1b2ea262e
# ignite-901 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1b2ea262 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1b2ea262 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1b2ea262 Branch: refs/heads/ignite-901 Commit: 1b2ea262e29435724dd01ad41d42a2834ea8d32a Parents: c0e62bd Author: sboikov <sboi...@gridgain.com> Authored: Mon Jul 13 17:45:06 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Mon Jul 13 17:45:06 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java | 8 +++++--- .../ignite/internal/IgniteClientReconnectAbstractTest.java | 2 ++ 2 files changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b2ea262/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java index f812dba..1ae9b85 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java @@ -1483,13 +1483,15 @@ class ClientImpl extends TcpDiscoveryImpl { notifyDiscovery(EVT_NODE_JOINED, topVer, locNode, nodes); - if (disconnected()) + boolean disconnected = disconnected(); + + state = CONNECTED; + + if (disconnected) notifyDiscovery(EVT_CLIENT_NODE_RECONNECTED, topVer, locNode, nodes); else spi.stats.onJoinFinished(); - state = CONNECTED; - joinErr.set(null);; joinLatch.countDown(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b2ea262/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAbstractTest.java index ac60617..8199a2c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAbstractTest.java @@ -67,6 +67,8 @@ public abstract class IgniteClientReconnectAbstractTest extends GridCommonAbstra disco.setIpFinder(ipFinder); disco.setJoinTimeout(2 * 60_000); + disco.setNetworkTimeout(1000); + disco.setSocketTimeout(1000); cfg.setDiscoverySpi(disco);
