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 6E463200B3B for ; Mon, 11 Jul 2016 17:10:26 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 6CA55160A78; Mon, 11 Jul 2016 15:10:26 +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 B4933160A5E for ; Mon, 11 Jul 2016 17:10:25 +0200 (CEST) Received: (qmail 77239 invoked by uid 500); 11 Jul 2016 15:10:24 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 77230 invoked by uid 99); 11 Jul 2016 15:10:24 -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, 11 Jul 2016 15:10:24 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B2C9CDFFF8; Mon, 11 Jul 2016 15:10:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: magyari_sandor@apache.org To: commits@ambari.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-17618. Fix ConcurrentModificationException in Resource.Type (magyari_sandor) Date: Mon, 11 Jul 2016 15:10:24 +0000 (UTC) archived-at: Mon, 11 Jul 2016 15:10:26 -0000 Repository: ambari Updated Branches: refs/heads/trunk 15e58ecc2 -> e8bfdb924 AMBARI-17618. Fix ConcurrentModificationException in Resource.Type (magyari_sandor) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e8bfdb92 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e8bfdb92 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e8bfdb92 Branch: refs/heads/trunk Commit: e8bfdb9248d8b305650555c7a7d2b230a163639b Parents: 15e58ec Author: Sandor Magyari Authored: Mon Jul 11 14:14:29 2016 +0200 Committer: Sandor Magyari Committed: Mon Jul 11 17:02:45 2016 +0200 ---------------------------------------------------------------------- .../org/apache/ambari/server/controller/spi/Resource.java | 8 ++++++-- .../ambari/server/controller/utilities/PropertyHelper.java | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e8bfdb92/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/Resource.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/Resource.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/Resource.java index 6853266..bb452bb 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/Resource.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/Resource.java @@ -19,8 +19,12 @@ package org.apache.ambari.server.controller.spi; +import java.util.Collections; +import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentSkipListMap; /** * The resource object represents a requested resource. The resource @@ -185,7 +189,7 @@ public interface Resource { /** * Map of all registered types. */ - private static Map types = new LinkedHashMap(); + private static Map types = new ConcurrentHashMap(); /** * Ordinal number counter for registering external types. @@ -442,7 +446,7 @@ public interface Resource { } // register the type by name - private static synchronized void setType(String name, Type type) { + private static void setType(String name, Type type) { types.put(name, type); } http://git-wip-us.apache.org/repos/asf/ambari/blob/e8bfdb92/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/PropertyHelper.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/PropertyHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/PropertyHelper.java index bddce28..4ded10e 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/PropertyHelper.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/PropertyHelper.java @@ -499,7 +499,7 @@ public class PropertyHelper { Map innerMap = new HashMap(); for (Map.Entry entry1 : entry.getValue().entrySet()) { - innerMap.put(Resource.Type.values()[entry1.getKey().ordinal()], entry1.getValue()); + innerMap.put(Resource.Type.valueOf(entry1.getKey().name()), entry1.getValue()); } returnMap.put(entry.getKey(), innerMap); }