Changeset 2066

Timestamp:

08/08/12 08:24:51 (12 years ago)

Author:

twagoo

Message:

Fixed NPE in checking whether comment can be deleted

File:

• ComponentRegistry/branches/ComponentRegistry-1.12.0/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryDbImpl.java (modified) (3 diffs)

ComponentRegistry/branches/ComponentRegistry-1.12.0/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryDbImpl.java

@@ -2 +2 @@
 
 import clarin.cmdi.componentregistry.CMDComponentSpecExpander;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.security.Principal;
-import java.text.ParseException;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-
-import javax.xml.bind.JAXBException;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.dao.DataAccessException;
-
 import clarin.cmdi.componentregistry.ComponentRegistry;
 import clarin.cmdi.componentregistry.ComponentRegistryException;
@@ -35 +15 @@
 import clarin.cmdi.componentregistry.model.ProfileDescription;
 import clarin.cmdi.componentregistry.model.RegistryUser;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+import java.security.Principal;
+import java.text.ParseException;
+import java.util.Calendar;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import javax.xml.bind.JAXBException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.dao.DataAccessException;
 
 /**
@@ -210 +207 @@
         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));