Merge branch 'ignite-1139' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-1139
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f3908653 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f3908653 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f3908653 Branch: refs/heads/ignite-1139 Commit: f39086536e3afd031ed158e9cd2d65afb71a32bf Parents: 14ee9df 84f8b95 Author: Denis Magda <dma...@gridgain.com> Authored: Mon Jul 27 08:42:28 2015 +0300 Committer: Denis Magda <dma...@gridgain.com> Committed: Mon Jul 27 08:42:28 2015 +0300 ---------------------------------------------------------------------- .../GridDhtPartitionsExchangeFuture.java | 20 +++++----- .../communication/tcp/TcpCommunicationSpi.java | 39 ++++++++++++++++++-- 2 files changed, 46 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f3908653/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java index f76025d,5159e18..a553532 --- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java @@@ -2427,16 -2267,16 +2433,22 @@@ public class TcpCommunicationSpi extend else if (log.isDebugEnabled()) log.debug("Received remote node ID: " + rmtNodeId0); - ch.write(ByteBuffer.wrap(U.IGNITE_HEADER)); + if (isSslEnabled() ) { + assert sslHnd != null; + + ch.write(sslHnd.encrypt(ByteBuffer.wrap(U.IGNITE_HEADER))); + } + else + ch.write(ByteBuffer.wrap(U.IGNITE_HEADER)); + ClusterNode localNode = getLocalNode(); + + if (localNode == null) + throw new IgniteCheckedException("Local node is not started or fully initialized [isStopping=" + + getSpiContext().isStopping() + ']'); + if (recovery != null) { - HandshakeMessage msg = new HandshakeMessage(getLocalNode().id(), + HandshakeMessage msg = new HandshakeMessage(localNode.id(), recovery.incrementConnectCount(), recovery.receivedCount());
