Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2BD1918900 for ; Thu, 2 Jul 2015 17:41:01 +0000 (UTC) Received: (qmail 87280 invoked by uid 500); 2 Jul 2015 17:41:01 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 87248 invoked by uid 500); 2 Jul 2015 17:41:01 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 87196 invoked by uid 99); 2 Jul 2015 17:41:01 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Jul 2015 17:41:01 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id A7D8C1817A8 for ; Thu, 2 Jul 2015 17:41:00 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.791 X-Spam-Level: * X-Spam-Status: No, score=1.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id Fj67XoEDIEZF for ; Thu, 2 Jul 2015 17:40:52 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id C09FA24CE8 for ; Thu, 2 Jul 2015 17:40:51 +0000 (UTC) Received: (qmail 86962 invoked by uid 99); 2 Jul 2015 17:40:51 -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, 02 Jul 2015 17:40:51 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id EB4DFE365B; Thu, 2 Jul 2015 17:40:50 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Thu, 02 Jul 2015 17:40:50 -0000 Message-Id: <52c250edcb364403a5e4443c07aad594@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/8] incubator-ignite git commit: # ignite-648: concurrent map Repository: incubator-ignite Updated Branches: refs/heads/ignite-648-failover d0b8b0dd9 -> a3f9dc17d # ignite-648: concurrent map Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/04aaa6ed Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/04aaa6ed Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/04aaa6ed Branch: refs/heads/ignite-648-failover Commit: 04aaa6ed51e8ec731e3eb37ee9ce7001973d22ee Parents: efb8239 Author: ashutak Authored: Wed Jul 1 17:52:09 2015 +0300 Committer: ashutak Committed: Wed Jul 1 17:52:09 2015 +0300 ---------------------------------------------------------------------- .../ignite/testframework/junits/multijvm/IgniteProcessProxy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/04aaa6ed/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java index 6da478d..7c1769a 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java @@ -43,7 +43,7 @@ import java.util.concurrent.*; @SuppressWarnings("TransientFieldInNonSerializableClass") public class IgniteProcessProxy implements IgniteEx { /** Grid proxies. */ - private static final transient Map gridProxies = new HashMap<>(); + private static final transient ConcurrentMap gridProxies = new ConcurrentHashMap<>(); /** Jvm process with ignite instance. */ private final transient GridJavaProcess proc;