Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/de39fbf2 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/de39fbf2 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/de39fbf2 Branch: refs/heads/ignite-843 Commit: de39fbf269ad6f834ab01444558ea2dced1c2035 Parents: f380883 1282f8b Author: Dmitiry Setrakyan <dsetrak...@gridgain.com> Authored: Wed Sep 30 14:19:28 2015 +0200 Committer: Dmitiry Setrakyan <dsetrak...@gridgain.com> Committed: Wed Sep 30 14:19:28 2015 +0200 ---------------------------------------------------------------------- .../discovery/GridDiscoveryManager.java | 22 +-- .../processors/cache/GridCacheEventManager.java | 12 +- .../processors/cache/GridCacheIoManager.java | 76 +-------- .../processors/cache/GridCacheMessage.java | 7 - .../processors/cache/GridCacheProcessor.java | 68 +++++--- .../cache/GridCacheSharedContext.java | 32 ---- .../processors/cache/GridCacheUtils.java | 8 - .../dht/GridDhtAffinityAssignmentRequest.java | 5 - .../dht/GridDhtAffinityAssignmentResponse.java | 5 - .../distributed/dht/GridDhtLockRequest.java | 5 - .../distributed/dht/GridDhtTxFinishRequest.java | 5 - .../dht/GridDhtTxPrepareRequest.java | 7 +- .../dht/preloader/GridDhtForceKeysRequest.java | 5 - .../dht/preloader/GridDhtForceKeysResponse.java | 5 - .../GridDhtPartitionDemandMessage.java | 5 - .../GridDhtPartitionSupplyMessage.java | 5 - .../GridDhtPartitionsAbstractMessage.java | 5 - .../dht/preloader/GridDhtPreloader.java | 6 + .../IgniteClientReconnectAbstractTest.java | 35 ++++- .../IgniteClientReconnectCacheTest.java | 154 +++++++++++++++++++ .../IgniteCacheP2pUnmarshallingErrorTest.java | 7 + ...CacheP2pUnmarshallingRebalanceErrorTest.java | 12 +- 22 files changed, 266 insertions(+), 225 deletions(-) ----------------------------------------------------------------------