Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-1173
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/26c2af41 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/26c2af41 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/26c2af41 Branch: refs/heads/ignite-1173 Commit: 26c2af41aa7c380c1efa867a3b15ef819ff3bb87 Parents: ae62426 1c10ade Author: iveselovskiy <iveselovs...@gridgain.com> Authored: Fri Jul 31 21:33:03 2015 +0300 Committer: iveselovskiy <iveselovs...@gridgain.com> Committed: Fri Jul 31 21:33:03 2015 +0300 ---------------------------------------------------------------------- .../JettyRestProcessorAbstractSelfTest.java | 14 +- .../managers/communication/GridIoManager.java | 108 ++++- .../GridDhtPartitionsExchangeFuture.java | 20 +- .../handlers/query/QueryCommandHandler.java | 6 +- .../util/nio/GridCommunicationClient.java | 5 +- .../util/nio/GridNioFinishedFuture.java | 12 + .../ignite/internal/util/nio/GridNioFuture.java | 14 + .../internal/util/nio/GridNioFutureImpl.java | 15 + .../util/nio/GridNioRecoveryDescriptor.java | 13 +- .../ignite/internal/util/nio/GridNioServer.java | 5 + .../util/nio/GridNioSessionMetaKey.java | 5 +- .../util/nio/GridShmemCommunicationClient.java | 7 +- .../util/nio/GridTcpNioCommunicationClient.java | 14 +- .../communication/tcp/TcpCommunicationSpi.java | 84 +++- .../ignite/spi/discovery/tcp/ServerImpl.java | 45 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 2 +- ...CommunicationRecoveryAckClosureSelfTest.java | 464 +++++++++++++++++++ .../tcp/TcpDiscoveryMultiThreadedTest.java | 8 +- .../IgniteSpiCommunicationSelfTestSuite.java | 1 + .../http/jetty/GridJettyRestHandler.java | 12 +- 20 files changed, 778 insertions(+), 76 deletions(-) ----------------------------------------------------------------------
