LDAP: Prevent error when user attr field is missing

yona-projects · Jul 4, 2017 · e3f9e87 · e3f9e87
1 parent e115c18
commit e3f9e87
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/controllers/UserApp.java b/app/controllers/UserApp.java
@@ -1153,7 +1153,7 @@ public static User authenticateWithLdap(String loginIdOrEmail, String password)
                     User.resetPassword(localUserFoundByLdapLogin.loginId, password);
                 }
 
-                if (StringUtils.isNotEmpty(ldapUser.getDepartment())) {
+                if (StringUtils.isNotBlank(ldapUser.getDepartment())) {
                     localUserFoundByLdapLogin.name = ldapUser.getDisplayName() + " [" + ldapUser.getDepartment() + "]";
                 } else {
                     localUserFoundByLdapLogin.name = ldapUser.getDisplayName();

diff --git a/app/models/support/LdapUser.java b/app/models/support/LdapUser.java
@@ -28,7 +28,7 @@ public String getDisplayName() {
 
     private String getString(Attribute attr) {
         try {
-            if (attr.get() == null){
+            if (attr == null || attr.get() == null){
                 return "";
             } else {
                 return attr.get().toString();