[ambari] branch trunk updated: AMBARI-25084. Delete identities fails when removing service in reverse order (amagyar) (#2751)

[amagyar]

This is an automated email from the ASF dual-hosted git repository.

amagyar pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
     new ecce211  AMBARI-25084. Delete identities fails when removing service 
in reverse order (amagyar) (#2751)
ecce211 is described below

commit ecce21178c9f3612dca8354b9874e16ec7702078
Author: Attila Magyar <m.magy...@gmail.com>
AuthorDate: Fri Jan 4 09:58:28 2019 +0100

    AMBARI-25084. Delete identities fails when removing service in reverse 
order (amagyar) (#2751)
---
 .../src/main/java/org/apache/ambari/server/orm/dao/ClusterDAO.java    | 4 ++++
 .../java/org/apache/ambari/server/orm/dao/ServiceConfigDAOTest.java   | 3 +++
 2 files changed, 7 insertions(+)

diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ClusterDAO.java 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ClusterDAO.java
index b6786fc..41d032f 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ClusterDAO.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ClusterDAO.java
@@ -19,6 +19,7 @@
 package org.apache.ambari.server.orm.dao;
 
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 
 import javax.persistence.EntityManager;
@@ -223,6 +224,9 @@ public class ClusterDAO {
   @RequiresSession
   public List<ClusterConfigEntity> getLatestConfigurationsWithTypes(long 
clusterId, StackId stackId, Collection<String> configTypes) {
     StackEntity stackEntity = stackDAO.find(stackId.getStackName(), 
stackId.getStackVersion());
+    if (configTypes.isEmpty()) {
+      return Collections.emptyList();
+    }
     return daoUtils.selectList(
       entityManagerProvider.get()
       
.createNamedQuery("ClusterConfigEntity.findLatestConfigsByStackWithTypes", 
ClusterConfigEntity.class)
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/ServiceConfigDAOTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/ServiceConfigDAOTest.java
index 80cb4dc..43d0066 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/ServiceConfigDAOTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/ServiceConfigDAOTest.java
@@ -22,6 +22,7 @@ import static java.util.Arrays.asList;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
@@ -492,6 +493,8 @@ public class ServiceConfigDAOTest {
     Assert.assertEquals(1, entities.size());
     entities = 
clusterDAO.getLatestConfigurationsWithTypes(clusterEntity.getClusterId(), 
HDP_01, asList("no-such-type"));
     Assert.assertTrue(entities.isEmpty());
+    entities = 
clusterDAO.getLatestConfigurationsWithTypes(clusterEntity.getClusterId(), 
HDP_01, Collections.emptyList());
+    Assert.assertTrue(entities.isEmpty());
   }
 
   /**