Merged in SHIBUI-1029 (pull request #281)

[SHIBUI-1029]
TIER · Jan 24, 2019 · 4d8039b · 4d8039b
2 parents 01ac06a + d6ff6dd
commit 4d8039b
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EmailServiceImpl.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EmailServiceImpl.java
@@ -2,6 +2,7 @@
 
 import edu.internet2.tier.shibboleth.admin.ui.security.model.User;
 import edu.internet2.tier.shibboleth.admin.ui.security.repository.UserRepository;
+import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.support.ResourceBundleMessageSource;
@@ -72,6 +73,6 @@ public String[] getSystemAdminEmailAddresses() {
             logger.warn("No users with ROLE_ADMIN were found! Check your configuration!");
             systemAdmins = new HashSet<>();
         }
-        return systemAdmins.stream().map(User::getEmailAddress).distinct().toArray(String[]::new);
+        return systemAdmins.stream().filter(user -> StringUtils.isNotBlank(user.getEmailAddress())).map(User::getEmailAddress).distinct().toArray(String[]::new);
     }
 }