You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by am...@apache.org on 2018/08/13 13:28:00 UTC
[ambari] branch branch-2.7 updated: AMBARI-24462. ambari-server
upgrade stuck with NPE (amagyar) (#2043) (#2045)
This is an automated email from the ASF dual-hosted git repository.
amagyar 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 69cd83e AMBARI-24462. ambari-server upgrade stuck with NPE (amagyar) (#2043) (#2045)
69cd83e is described below
commit 69cd83e9f577779430ddaee2e1d3f84dc673d20e
Author: Attila Magyar <m....@gmail.com>
AuthorDate: Mon Aug 13 15:27:57 2018 +0200
AMBARI-24462. ambari-server upgrade stuck with NPE (amagyar) (#2043) (#2045)
---
.../java/org/apache/ambari/server/controller/KerberosHelperImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
index bff5640..dfeb61c 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
@@ -1614,14 +1614,14 @@ public class KerberosHelperImpl implements KerberosHelper {
// validating owner and group
boolean differentOwners = false;
String warnTemplate = "Keytab '{}' on host '{}' has different {}, originally set to '{}' and '{}:{}' has '{}', using '{}'";
- if (!resolvedKeytab.getOwnerName().equals(sameKeytab.getOwnerName())) {
+ if (!StringUtils.equals(resolvedKeytab.getOwnerName(), sameKeytab.getOwnerName())) {
LOG.warn(warnTemplate,
keytabFilePath, hostname, "owners", sameKeytab.getOwnerName(),
serviceName, componentName, resolvedKeytab.getOwnerName(),
sameKeytab.getOwnerName());
differentOwners = true;
}
- if (!resolvedKeytab.getOwnerAccess().equals(sameKeytab.getOwnerAccess())) {
+ if (!StringUtils.equals(resolvedKeytab.getOwnerAccess(), sameKeytab.getOwnerAccess())) {
LOG.warn(warnTemplate,
keytabFilePath, hostname, "owner access", sameKeytab.getOwnerAccess(),
serviceName, componentName, resolvedKeytab.getOwnerAccess(),