IGNITE-709 Fix TcpClientDiscoverySpiSelfTest.testGetMissedMessagesOnReconnect().
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3112c1df Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3112c1df Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3112c1df Branch: refs/heads/ignite-23 Commit: 3112c1df04d6024bb0cf0c8ab8f15bcb42be4968 Parents: 325185b Author: sevdokimov <sevdoki...@gridgain.com> Authored: Thu May 21 17:15:00 2015 +0300 Committer: sevdokimov <sevdoki...@gridgain.com> Committed: Thu May 21 17:15:00 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java | 4 ++-- .../ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3112c1df/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java index e4c5147..54efb44 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java @@ -116,7 +116,7 @@ public class TcpClientDiscoverySpi extends TcpDiscoverySpiAdapter implements Tcp private final Timer timer = new Timer("TcpClientDiscoverySpi.timer"); /** */ - private MessageWorker msgWorker; + protected MessageWorker msgWorker; /** * Default constructor. @@ -1007,7 +1007,7 @@ public class TcpClientDiscoverySpi extends TcpDiscoverySpiAdapter implements Tcp /** * Message worker. */ - private class MessageWorker extends IgniteSpiThread { + protected class MessageWorker extends IgniteSpiThread { /** Message queue. */ private final BlockingDeque<Object> queue = new LinkedBlockingDeque<>(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3112c1df/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java index d534d6a..a927110 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java @@ -1142,7 +1142,7 @@ public class TcpClientDiscoverySpiSelfTest extends GridCommonAbstractTest { public void pauseAll() { pauseResumeOperation(true, openSockLock, writeLock); - brakeConnection(); + msgWorker.suspend(); } /** @@ -1150,6 +1150,8 @@ public class TcpClientDiscoverySpiSelfTest extends GridCommonAbstractTest { */ public void resumeAll() { pauseResumeOperation(false, openSockLock, writeLock); + + msgWorker.resume(); } } }
