Changeset 2067

Timestamp:

08/08/12 08:27:30 (12 years ago)

Author:

twagoo

Message:

Merged NPE fix in checking whether comment can be deleted from 1.12 branch

File:

• ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryDbImpl.java (modified) (1 diff)

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryDbImpl.java

@@ -223 +223 @@
         if (principal != null && principal.getName() != null) {
             final RegistryUser registryUser = userDao.getByPrincipalName(principal.getName());
-            final String registryUserId = registryUser.getId().toString();
-            final boolean isAdmin = configuration.isAdminUser(principal);
+            final String registryUserId = registryUser == null ? null : registryUser.getId().toString();
+            final boolean isAdmin = registryUser != null && configuration.isAdminUser(principal);
             for (Comment comment : comments) {
                 comment.setCanDelete(isAdmin || comment.getUserId().equals(registryUserId));