ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nc...@apache.org
Subject [26/50] [abbrv] ambari git commit: AMBARI-13894. Refactor delete configs on delete service action. Bug fix for JPA entity merge. (swagle)
Date Wed, 18 Nov 2015 16:51:22 GMT
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/82a53982
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/82a53982
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/82a53982

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 82a53982fddca70c5593ab6d74760805d05f9eaa
Parents: 6212d9d
Author: Siddharth Wagle <swagle@hortonworks.com>
Authored: Tue Nov 17 13:57:07 2015 -0800
Committer: Siddharth Wagle <swagle@hortonworks.com>
Committed: Tue Nov 17 13:57:07 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/82a53982/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 0be04f3..fe96ea2 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
@@ -3017,6 +3017,7 @@ public class ClusterImpl implements Cluster {
         clusterDAO.removeConfig(configEntity);
         removedClusterConfigs.add(configEntity);
       }
+      serviceConfig.getClusterConfigEntities().clear();
       serviceConfigDAO.remove(serviceConfig);
       serviceConfigEntities.remove(serviceConfig);
     }


Mime
View raw message