Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id EC76E200C64 for ; Thu, 13 Apr 2017 15:41:10 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id EB59C160BA7; Thu, 13 Apr 2017 13:41:10 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id D4215160BB7 for ; Thu, 13 Apr 2017 15:41:09 +0200 (CEST) Received: (qmail 79043 invoked by uid 500); 13 Apr 2017 13:41:09 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 78688 invoked by uid 99); 13 Apr 2017 13:41:08 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Apr 2017 13:41:08 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CE8FCF17B3; Thu, 13 Apr 2017 13:41:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: agoncharuk@apache.org To: commits@ignite.apache.org Date: Thu, 13 Apr 2017 13:41:26 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [19/22] ignite git commit: Merge branch 'ignite-3477-master' of https://github.com/gridgain/apache-ignite into ignite-3477-master archived-at: Thu, 13 Apr 2017 13:41:11 -0000 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-3477-master Commit: 1469f2848e0dc190400b85ee501bf513d47d0239 Parents: 4849447 c31de27 Author: Alexey Goncharuk Authored: Thu Apr 13 16:32:43 2017 +0300 Committer: Alexey Goncharuk 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(); + } }