Merge ignite-4499.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/db84b9b6 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/db84b9b6 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/db84b9b6 Branch: refs/heads/ignite-1.9 Commit: db84b9b6e39ac37791b35479bccb8bbd75bb1676 Parents: 09ed128 Author: sboikov <[email protected]> Authored: Mon Jan 23 11:26:18 2017 +0300 Committer: sboikov <[email protected]> Committed: Mon Jan 23 11:26:18 2017 +0300 ---------------------------------------------------------------------- .../spi/communication/tcp/TcpCommunicationSpiDropNodesTest.java | 5 +++-- .../communication/tcp/TcpCommunicationSpiFaultyClientTest.java | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/db84b9b6/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiDropNodesTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiDropNodesTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiDropNodesTest.java index d29231e..2b49d53 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiDropNodesTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiDropNodesTest.java @@ -297,7 +297,8 @@ public class TcpCommunicationSpiDropNodesTest extends GridCommonAbstractTest { */ private static class TestCommunicationSpi extends TcpCommunicationSpi { /** {@inheritDoc} */ - @Override protected GridCommunicationClient createTcpClient(ClusterNode node) throws IgniteCheckedException { + @Override protected GridCommunicationClient createTcpClient(ClusterNode node, int connIdx) + throws IgniteCheckedException { if (pred.apply(getLocalNode(), node)) { Map<String, Object> attrs = new HashMap<>(node.attributes()); @@ -309,7 +310,7 @@ public class TcpCommunicationSpiDropNodesTest extends GridCommonAbstractTest { ((TcpDiscoveryNode)node).setAttributes(attrs); } - return super.createTcpClient(node); + return super.createTcpClient(node, connIdx); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/db84b9b6/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiFaultyClientTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiFaultyClientTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiFaultyClientTest.java index 6e99487..f9756e9 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiFaultyClientTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiFaultyClientTest.java @@ -245,7 +245,8 @@ public class TcpCommunicationSpiFaultyClientTest extends GridCommonAbstractTest */ private static class TestCommunicationSpi extends TcpCommunicationSpi { /** {@inheritDoc} */ - @Override protected GridCommunicationClient createTcpClient(ClusterNode node) throws IgniteCheckedException { + @Override protected GridCommunicationClient createTcpClient(ClusterNode node, int connIdx) + throws IgniteCheckedException { if (PRED.apply(node)) { Map<String, Object> attrs = new HashMap<>(node.attributes()); @@ -257,7 +258,7 @@ public class TcpCommunicationSpiFaultyClientTest extends GridCommonAbstractTest ((TcpDiscoveryNode)node).setAttributes(attrs); } - return super.createTcpClient(node); + return super.createTcpClient(node, connIdx); } /**
