IGNITE-8860 Returned IgniteDiscoveryThread to RingMessageWorker. - Fixes #4248.
Signed-off-by: Alexey Goncharuk <alexey.goncha...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/219bc81b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/219bc81b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/219bc81b Branch: refs/heads/ignite-8900-repro Commit: 219bc81b730ea3ba078b61f96c9dab354496c22b Parents: d6ab2ae Author: Andrey Kuznetsov <stku...@gmail.com> Authored: Thu Jun 28 18:38:22 2018 +0300 Committer: Alexey Goncharuk <alexey.goncha...@gmail.com> Committed: Thu Jun 28 18:38:22 2018 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/spi/discovery/tcp/ServerImpl.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/219bc81b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java index 170c1ba..bb76895 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java @@ -110,6 +110,7 @@ import org.apache.ignite.spi.IgniteSpiOperationTimeoutHelper; import org.apache.ignite.spi.IgniteSpiThread; import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; import org.apache.ignite.spi.discovery.DiscoverySpiListener; +import org.apache.ignite.spi.discovery.IgniteDiscoveryThread; import org.apache.ignite.spi.discovery.tcp.internal.DiscoveryDataPacket; import org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryNode; import org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryNodesRing; @@ -340,7 +341,7 @@ class ServerImpl extends TcpDiscoveryImpl { msgWorker = new RingMessageWorker(log); - new MessageWorkerThread(msgWorker, log).start(); + new MessageWorkerDiscoveryThread(msgWorker, log).start(); if (tcpSrvr == null) tcpSrvr = new TcpServer(log); @@ -6821,6 +6822,14 @@ class ServerImpl extends TcpDiscoveryImpl { } } + /** */ + private class MessageWorkerDiscoveryThread extends MessageWorkerThread implements IgniteDiscoveryThread { + /** {@inheritDoc} */ + private MessageWorkerDiscoveryThread(GridWorker worker, IgniteLogger log) { + super(worker, log); + } + } + /** * Slightly modified {@link IgniteSpiThread} intended to use with message workers. */
