Updated Branches: refs/heads/trunk ceb2fc412 -> 45a53ede1
AMBARI-3119. NullPointerException thrown while retrieving ganglia properties. (swagle) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/45a53ede Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/45a53ede Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/45a53ede Branch: refs/heads/trunk Commit: 45a53ede17c6a1f451bbf0a795a5cac6dec04298 Parents: ceb2fc4 Author: Siddharth Wagle <[email protected]> Authored: Thu Sep 5 15:51:22 2013 -0700 Committer: Siddharth Wagle <[email protected]> Committed: Thu Sep 5 15:51:22 2013 -0700 ---------------------------------------------------------------------- .../server/controller/ganglia/GangliaPropertyProvider.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/45a53ede/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProvider.java index 49d9e38..6cc981c 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProvider.java @@ -222,7 +222,9 @@ public abstract class GangliaPropertyProvider extends AbstractPropertyProvider { Map<String, PropertyInfo> componentMetricMap = getComponentMetrics().get(getComponentName(resource)); - if (!componentMetricMap.containsKey(id)) { + // Not all components have metrics + if (componentMetricMap != null && + !componentMetricMap.containsKey(id)) { updateComponentMetricMap(componentMetricMap, id); }
