You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2013/03/21 20:09:01 UTC
svn commit: r1459480 - in /incubator/ambari/trunk: CHANGES.txt
ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
Author: ncole
Date: Thu Mar 21 19:09:00 2013
New Revision: 1459480
URL: http://svn.apache.org/r1459480
Log:
AMBARI-1678. Fix when there are no service-level configs
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1459480&r1=1459479&r2=1459480&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Thu Mar 21 19:09:00 2013
@@ -521,6 +521,8 @@ Trunk (unreleased changes):
AMBARI-1657. User directories on HDFS do not get created with custom names
provided from Ambari UI. (swagle)
+ AMBARI-1678. Fix when there are no service overrides. (ncole)
+
AMBARI-1655. DELETE is not successful against ClusterStateEntity (ncole)
AMBARI-1439. rrd file location should be read from global config. (swagle)
Modified: incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java?rev=1459480&r1=1459479&r2=1459480&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java (original)
+++ incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java Thu Mar 21 19:09:00 2013
@@ -1974,9 +1974,11 @@ public class AmbariManagementControllerI
Host host = clusters.getHost(scHost.getHostName());
DesiredConfig dc = host.getDesiredConfigs(scHost.getClusterId()).get(type);
if (null != dc) {
- Config hostConfig = cluster.getConfig(svcConfig.getType(), dc.getVersion());
- props.putAll(hostConfig.getProperties());
- tags.put("host_override_tag", hostConfig.getVersionTag());
+ Config hostConfig = cluster.getConfig(type, dc.getVersion());
+ if (null != hostConfig) {
+ props.putAll(hostConfig.getProperties());
+ tags.put("host_override_tag", hostConfig.getVersionTag());
+ }
}
configurations.put(type, props);