[openmeetings] branch 4.0.x updated: [OPENMEETINGS-1900] warning is adderessed

[so...@apache.org]

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

solomax pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/4.0.x by this push:
     new 928fda4  [OPENMEETINGS-1900] warning is adderessed
928fda4 is described below

commit 928fda4d508cf8f0389942970ec25035eabc72d7
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Thu Jun 21 11:10:00 2018 +0700

    [OPENMEETINGS-1900] warning is adderessed
---
 .../java/org/apache/openmeetings/core/ldap/LdapLoginManager.java     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManager.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManager.java
index 34946af..92b1e84 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManager.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManager.java
@@ -145,7 +145,10 @@ public class LdapLoginManager {
 
 	private static Attribute getAttr(Properties config, Entry entry, String aliasCode, String defaultAlias) {
 		String alias = config.getProperty(aliasCode, "");
-		Attribute a = entry.get(Strings.isEmpty(alias) ? defaultAlias : alias);
+		if (Strings.isEmpty(alias)) {
+			alias = defaultAlias;
+		}
+		Attribute a = Strings.isEmpty(alias) ? null : entry.get(alias);
 		return a == null ? null : a;
 	}