ATLAS-3667: Option to store Ldap/AD bind password in jceks keystore file - #2 (fix for NPE)

intg/src/main/java/org/apache/atlas/ApplicationProperties.java

@@ -277,15 +277,18 @@ public final class ApplicationProperties extends PropertiesConfiguration {
     }
 
     private static void setLdapPasswordFromKeystore(Configuration configuration) {
+        String ldapType = configuration.getString(LDAP_TYPE);
+
+        if (StringUtils.isNotEmpty(ldapType)) {
             try {
-            if (configuration.getString(LDAP_TYPE).equalsIgnoreCase("ldap")) {
+                if (ldapType.equalsIgnoreCase("ldap")) {
                     String maskPasssword = configuration.getString(LDAP_BIND_PASSWORD);
                     if (MASK_LDAP_PASSWORD.equals(maskPasssword)) {
                         String password = SecurityUtil.getPassword(configuration, LDAP_BIND_PASSWORD);
                         configuration.clearProperty(LDAP_BIND_PASSWORD);
                         configuration.addProperty(LDAP_BIND_PASSWORD, password);
                     }
-            } else if (configuration.getString(LDAP_TYPE).equalsIgnoreCase("ad")) {
+                } else if (ldapType.equalsIgnoreCase("ad")) {
                     String maskPasssword = configuration.getString(LDAP_AD_BIND_PASSWORD);
                     if (MASK_LDAP_PASSWORD.equals(maskPasssword)) {
                         String password = SecurityUtil.getPassword(configuration, LDAP_AD_BIND_PASSWORD);
@@ -297,6 +300,7 @@ public final class ApplicationProperties extends PropertiesConfiguration {
                 LOG.error("Error in getting secure password ", e);
             }
         }
+    }
 
     private void setDefaults() {
         AtlasRunMode runMode = AtlasRunMode.valueOf(getString(ATLAS_RUN_MODE, DEFAULT_ATLAS_RUN_MODE.name()));