Repository: ambari Updated Branches: refs/heads/branch-2.5 d9683dbc7 -> b2e21aba4
AMBARI-20827 - Use java.util.concurrent.ConcurrentHashMap instead of org.jboss.netty.util.internal.ConcurrentHashMap (Akira Ajisaka via jonathanhurley) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b2e21aba Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b2e21aba Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b2e21aba Branch: refs/heads/branch-2.5 Commit: b2e21aba4db7802299c20aae3e5d7a19d3545c4a Parents: d9683db Author: Jonathan Hurley <jhur...@hortonworks.com> Authored: Fri Jun 2 10:28:20 2017 -0400 Committer: Jonathan Hurley <jhur...@hortonworks.com> Committed: Fri Jun 2 10:40:23 2017 -0400 ---------------------------------------------------------------------- .../server/state/svccomphost/ServiceComponentHostImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/b2e21aba/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostImpl.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostImpl.java index 6e4979c..4d034f6 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostImpl.java @@ -25,6 +25,7 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReadWriteLock; @@ -77,7 +78,6 @@ import org.apache.ambari.server.state.fsm.SingleArcTransition; import org.apache.ambari.server.state.fsm.StateMachine; import org.apache.ambari.server.state.fsm.StateMachineFactory; import org.apache.ambari.server.state.stack.upgrade.RepositoryVersionHelper; -import org.jboss.netty.util.internal.ConcurrentHashMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -1282,7 +1282,7 @@ public class ServiceComponentHostImpl implements ServiceComponentHost { } ServiceComponentHostResponse r = new ServiceComponentHostResponse(clusterName, serviceName, - serviceComponentName, displayName, hostName, publicHostName, state, stackId, + serviceComponentName, displayName, hostName, publicHostName, state, stackId, desiredState, desiredStackId, componentAdminState); r.setActualConfigs(actualConfigs); @@ -1428,7 +1428,7 @@ public class ServiceComponentHostImpl implements ServiceComponentHost { for (Entry<String, Map<String, String>> entry : configTags.entrySet()) { String type = entry.getKey(); - Map<String, String> values = new HashMap<String, String>(entry.getValue()); + Map<String, String> values = new HashMap<>(entry.getValue()); String tag = values.get(ConfigHelper.CLUSTER_DEFAULT_TAG); values.remove(ConfigHelper.CLUSTER_DEFAULT_TAG);
