[ambari] branch branch-2.7 updated: AMBARI-24473. Ambari upgrade fails due to NPE when processing Ambari Infra kerberos descriptor changes (#2070)

[ol...@apache.org]

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

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


The following commit(s) were added to refs/heads/branch-2.7 by this push:
     new 45ac447  AMBARI-24473. Ambari upgrade fails due to NPE when processing Ambari Infra kerberos descriptor changes (#2070)
45ac447 is described below

commit 45ac4476c4d467eeb8df2d63419ceb59acd41387
Author: Olivér Szabó <ol...@gmail.com>
AuthorDate: Wed Aug 15 19:14:56 2018 +0200

    AMBARI-24473. Ambari upgrade fails due to NPE when processing Ambari Infra kerberos descriptor changes (#2070)
---
 .../java/org/apache/ambari/server/upgrade/UpgradeCatalog270.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog270.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog270.java
index 320bfd7..ed5c528 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog270.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog270.java
@@ -1282,8 +1282,10 @@ public class UpgradeCatalog270 extends AbstractUpgradeCatalog {
 
       for (KerberosServiceDescriptor serviceDescriptor : kerberosDescriptor.getServices().values()) {
         updateKerberosIdentities(serviceDescriptor);
-        for (KerberosComponentDescriptor componentDescriptor : serviceDescriptor.getComponents().values()) {
-          updateKerberosIdentities(componentDescriptor);
+        if (MapUtils.isNotEmpty(serviceDescriptor.getComponents())) {
+          for (KerberosComponentDescriptor componentDescriptor : serviceDescriptor.getComponents().values()) {
+            updateKerberosIdentities(componentDescriptor);
+          }
         }
       }