You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sw...@apache.org on 2015/11/17 22:54:37 UTC
ambari git commit: AMBARI-13894. Refactor delete configs on delete
service action. Bug fix for JPA entity merge. (swagle)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 57aa02f57 -> 9cf3bca8e
AMBARI-13894. Refactor delete configs on delete service action. Bug fix for JPA entity merge. (swagle)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9cf3bca8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9cf3bca8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9cf3bca8
Branch: refs/heads/branch-2.1
Commit: 9cf3bca8ea4f69b6e5528c31a039d7cc8c358e96
Parents: 57aa02f
Author: Siddharth Wagle <sw...@hortonworks.com>
Authored: Tue Nov 17 13:54:17 2015 -0800
Committer: Siddharth Wagle <sw...@hortonworks.com>
Committed: Tue Nov 17 13:54:26 2015 -0800
----------------------------------------------------------------------
.../java/org/apache/ambari/server/state/cluster/ClusterImpl.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/9cf3bca8/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
index 39e2d71..24b94da 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
@@ -2995,6 +2995,7 @@ public class ClusterImpl implements Cluster {
clusterDAO.removeConfig(configEntity);
removedClusterConfigs.add(configEntity);
}
+ serviceConfig.getClusterConfigEntities().clear();
serviceConfigDAO.remove(serviceConfig);
serviceConfigEntities.remove(serviceConfig);
}