# IGNITE-709 Move spiState to TcpDiscoverySpi.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cb762a48 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cb762a48 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cb762a48 Branch: refs/heads/ignite-836_2 Commit: cb762a4875a6ae1b6eb358f718ac2a160fc7f186 Parents: 816da0a Author: sevdokimov <sevdoki...@gridgain.com> Authored: Thu May 14 13:31:31 2015 +0300 Committer: sevdokimov <sevdoki...@gridgain.com> Committed: Thu May 14 13:31:31 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 3 +++ .../apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java | 5 ----- 2 files changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb762a48/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 10c8e9e..3f178b1 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 @@ -272,6 +272,9 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov /** Mutex. */ private final Object mux = new Object(); + /** Discovery state. */ + protected TcpDiscoverySpiState spiState = DISCONNECTED; + /** Map with proceeding ping requests. */ private final ConcurrentMap<InetSocketAddress, IgniteInternalFuture<IgniteBiTuple<UUID, Boolean>>> pingMap = new ConcurrentHashMap8<>(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb762a48/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java index ac925d2..181065d 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java @@ -42,8 +42,6 @@ import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import static org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoverySpiState.*; - /** * Base class for TCP discovery SPIs. */ @@ -136,9 +134,6 @@ abstract class TcpDiscoverySpiAdapter extends IgniteSpiAdapter implements Discov /** Socket timeout worker. */ protected SocketTimeoutWorker sockTimeoutWorker; - /** Discovery state. */ - protected TcpDiscoverySpiState spiState = DISCONNECTED; - /** Start time of the very first grid node. */ protected volatile long gridStartTime;
