[ambari] branch branch-2.6 updated: AMBARI-22939. Ambari throws NPE when deleting a service (amagyar)

[amagyar]

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

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


The following commit(s) were added to refs/heads/branch-2.6 by this push:
     new e460342  AMBARI-22939. Ambari throws NPE when deleting a service 
(amagyar)
e460342 is described below

commit e460342d2bab8720ec33206af9b1b278fcb058a5
Author: Attila Magyar <amag...@hortonworks.com>
AuthorDate: Thu Feb 8 09:24:49 2018 +0100

    AMBARI-22939. Ambari throws NPE when deleting a service (amagyar)
---
 .../main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 4a0e3a2..4170b12 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
@@ -1311,7 +1311,7 @@ public class ClusterImpl implements Cluster {
     Map<Long, ConfigGroup> configGroups = 
service.getCluster().getConfigGroups();
     if (!MapUtils.isEmpty(configGroups)) {
       for (ConfigGroup configGroup : configGroups.values()) {
-        if (configGroup.getServiceName().equalsIgnoreCase(serviceName)) {
+        if (configGroup.getServiceName() != null && 
configGroup.getServiceName().equalsIgnoreCase(serviceName)) {
           LOG.info("Deleting ConfigGroup {} for service {}", 
configGroup.getName(), serviceName);
           configGroup.delete();
           clusterConfigGroups.remove(configGroup.getId());

-- 
To stop receiving notification emails like this one, please contact
amag...@apache.org.