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 811C518E28 for ; Mon, 8 Jun 2015 22:28:49 +0000 (UTC) Received: (qmail 73922 invoked by uid 500); 8 Jun 2015 22:28:49 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 73892 invoked by uid 500); 8 Jun 2015 22:28:49 -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 73883 invoked by uid 99); 8 Jun 2015 22:28:49 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Jun 2015 22:28:49 +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 D6463181A3C for ; Mon, 8 Jun 2015 22:28:48 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.771 X-Spam-Level: * X-Spam-Status: No, score=1.771 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-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 PuzbsKTr-zjW for ; Mon, 8 Jun 2015 22:28:48 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id 65B3827637 for ; Mon, 8 Jun 2015 22:28:40 +0000 (UTC) Received: (qmail 73237 invoked by uid 99); 8 Jun 2015 22:28:40 -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; Mon, 08 Jun 2015 22:28:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3D75DE0016; Mon, 8 Jun 2015 22:28:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: agoncharuk@apache.org To: commits@ignite.incubator.apache.org Date: Mon, 08 Jun 2015 22:29:10 -0000 Message-Id: In-Reply-To: <28ffd79e54be4586abb0fbd2206f1f2e@git.apache.org> References: <28ffd79e54be4586abb0fbd2206f1f2e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [32/42] incubator-ignite git commit: # ignite-883 fix ConcurrentModificationException during DiscoCache initialization from the GridDiscoveryManager.start # ignite-883 fix ConcurrentModificationException during DiscoCache initialization from the GridDiscoveryManager.start Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f4da46cd Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f4da46cd Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f4da46cd Branch: refs/heads/ignite-389 Commit: f4da46cd25b61b3d7b55b6fba3884c8fa05f5cb8 Parents: 730ef10 Author: sboikov Authored: Mon Jun 8 10:27:04 2015 +0300 Committer: sboikov Committed: Mon Jun 8 10:27:04 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/managers/discovery/GridDiscoveryManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f4da46cd/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java index 142dbaa..5983553 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java @@ -173,7 +173,7 @@ public class GridDiscoveryManager extends GridManagerAdapter { new ConcurrentHashMap8<>(); /** Map of dynamic cache filters. */ - private Map registeredCaches = new HashMap<>(); + private Map registeredCaches = new ConcurrentHashMap<>(); /** */ private final GridSpinBusyLock busyLock = new GridSpinBusyLock();