Merge remote-tracking branch 'remotes/origin/ignite-836_2' into ignite-709_2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/668746f4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/668746f4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/668746f4 Branch: refs/heads/ignite-709_3 Commit: 668746f4191f36f7f12c6a17e1d2903bea983a3d Parents: 7099c56 073c48c Author: sevdokimov <sevdoki...@gridgain.com> Authored: Fri May 15 13:04:38 2015 +0300 Committer: sevdokimov <sevdoki...@gridgain.com> Committed: Fri May 15 13:04:38 2015 +0300 ---------------------------------------------------------------------- .../internal/events/DiscoveryCustomEvent.java | 18 +- .../managers/discovery/CustomEventListener.java | 31 + .../discovery/CustomMessageWrapper.java | 58 ++ .../discovery/DiscoveryCustomMessage.java | 41 + .../discovery/GridDiscoveryManager.java | 99 ++- .../cache/DynamicCacheChangeBatch.java | 15 +- .../GridCachePartitionExchangeManager.java | 4 +- .../processors/cache/GridCacheProcessor.java | 9 +- .../continuous/GridContinuousMessageType.java | 12 - .../continuous/GridContinuousProcessor.java | 796 ++++--------------- .../processors/continuous/StartRequestData.java | 267 +++++++ .../StartRoutineAckDiscoveryMessage.java | 71 ++ .../StartRoutineDiscoveryMessage.java | 95 +++ .../StopRoutineAckDiscoveryMessage.java | 58 ++ .../continuous/StopRoutineDiscoveryMessage.java | 59 ++ .../ignite/spi/discovery/DiscoverySpi.java | 7 +- .../discovery/DiscoverySpiCustomMessage.java | 32 + .../spi/discovery/DiscoverySpiListener.java | 5 +- .../discovery/tcp/TcpClientDiscoverySpi.java | 25 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 92 ++- .../TcpDiscoveryCustomEventMessage.java | 9 +- ...ridCacheContinuousQueryAbstractSelfTest.java | 6 +- .../discovery/AbstractDiscoverySelfTest.java | 8 +- .../tcp/TcpClientDiscoverySpiSelfTest.java | 6 +- 24 files changed, 1073 insertions(+), 750 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/668746f4/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java ----------------------------------------------------------------------
