Author: echatellier Date: 2014-06-20 15:35:32 +0200 (Fri, 20 Jun 2014) New Revision: 242 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/242 Log: Fix NPE Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailInterceptor.java Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailInterceptor.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailInterceptor.java 2014-06-20 09:44:35 UTC (rev 241) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailInterceptor.java 2014-06-20 13:35:32 UTC (rev 242) @@ -139,12 +139,13 @@ protected void populateUser(FaxToMailSession faxToMailSession, FaxToMailServiceContext serviceContext) { if (StringUtils.isNotBlank(faxToMailSession.getAuthenticatedUserId())) { LdapService ldapService = serviceContext.newService(LdapService.class); + // return can be null FaxToMailUser user = ldapService.getUserBean(faxToMailSession.getAuthenticatedUserId()); faxToMailSession.setAuthenticatedFaxToMailUser(user); // test si l'utilisateur est admin List<String> adminGroups = serviceContext.getApplicationConfig().getLdapAdminGroups(); - if (CollectionUtils.isNotEmpty(adminGroups) && user.getUserGroups() != null) { + if (user != null && CollectionUtils.isNotEmpty(adminGroups) && user.getUserGroups() != null) { for (FaxToMailUserGroup group : user.getUserGroups()) { if (adminGroups.contains(group.getFullPath())) { faxToMailSession.setAdmin(true);
participants (1)
-
echatellier@users.forge.codelutin.com