This is an automated email from the ASF dual-hosted git repository. oleewere 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 b73f84c AMBARI-24473. Ambari upgrade fails due to NPE when processing Ambari Infra kerberos descriptor changes (#2069) b73f84c is described below commit b73f84c9c32cfca28ad012960d0049af98ce65ed Author: Olivér Szabó <oleew...@gmail.com> AuthorDate: Wed Aug 15 19:14:35 2018 +0200 AMBARI-24473. Ambari upgrade fails due to NPE when processing Ambari Infra kerberos descriptor changes (#2069) --- .../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); + } } }