Return-Path: X-Original-To: apmail-ambari-commits-archive@www.apache.org Delivered-To: apmail-ambari-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7BF6418CD4 for ; Wed, 18 Nov 2015 16:50:58 +0000 (UTC) Received: (qmail 50266 invoked by uid 500); 18 Nov 2015 16:50:58 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 50186 invoked by uid 500); 18 Nov 2015 16:50:58 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 50094 invoked by uid 99); 18 Nov 2015 16:50:58 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Nov 2015 16:50:57 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D68B8E03C8; Wed, 18 Nov 2015 16:50:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ncole@apache.org To: commits@ambari.apache.org Date: Wed, 18 Nov 2015 16:51:22 -0000 Message-Id: <39b4c1e3b11645dbb09b691581688fe6@git.apache.org> In-Reply-To: <84d194f15d934b49a10e6f37996c1d51@git.apache.org> References: <84d194f15d934b49a10e6f37996c1d51@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [26/50] [abbrv] ambari git commit: AMBARI-13894. Refactor delete configs on delete service action. Bug fix for JPA entity merge. (swagle) 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 Authored: Tue Nov 17 13:57:07 2015 -0800 Committer: Siddharth Wagle 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); }