Merge branch 'ignite-3477-master' of https://github.com/gridgain/apache-ignite into ignite-3477-master
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1469f284 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1469f284 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1469f284 Branch: refs/heads/ignite-4587 Commit: 1469f2848e0dc190400b85ee501bf513d47d0239 Parents: 4849447 c31de27 Author: Alexey Goncharuk <[email protected]> Authored: Thu Apr 13 16:32:43 2017 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Thu Apr 13 16:32:43 2017 +0300 ---------------------------------------------------------------------- .../cache/transactions/IgniteTxHandler.java | 6 +- .../ignite/spi/discovery/tcp/ClientImpl.java | 4 +- ...lerCacheClientRequestsMappingOnMissTest.java | 94 +++++++++++++++----- .../near/GridCacheNearTxForceKeyTest.java | 7 ++ .../TxPessimisticDeadlockDetectionTest.java | 17 ++++ .../hibernate/HibernateKeyTransformer.java | 2 +- .../cache/hibernate/HibernateKeyWrapper.java | 2 +- ...QueryNodeRestartDistributedJoinSelfTest.java | 17 +++- 8 files changed, 121 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/1469f284/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxForceKeyTest.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxForceKeyTest.java index 47d54d5,66f34c9..f5b7635 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxForceKeyTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxForceKeyTest.java @@@ -78,6 -76,15 +78,13 @@@ public class GridCacheNearTxForceKeyTes assertNull(cache.getAndPut(key, key)); - awaitPartitionMapExchange(); - assertTrue(ignite0.affinity(null).isPrimary(ignite1.cluster().localNode(), key)); } + + /** {@inheritDoc} */ + @Override protected void afterTestsStopped() throws Exception { + super.afterTestsStopped(); + + stopAllGrids(); + } }
