Author: tchemit Date: 2014-03-25 18:16:23 +0100 (Tue, 25 Mar 2014) New Revision: 1748 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1748 Log: fix NPE Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java 2014-03-25 15:41:42 UTC (rev 1747) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java 2014-03-25 17:16:23 UTC (rev 1748) @@ -1,7 +1,7 @@ package fr.ifremer.wao.entity; import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Sets; import fr.ifremer.wao.ContactsFilter; import fr.ifremer.wao.WaoUtils; import org.apache.commons.collections4.CollectionUtils; @@ -104,15 +104,15 @@ } if (filter.isCommentDefinedOnly()) { - query.addNotIn(Contact.PROPERTY_COMMENT, ImmutableSet.of("", null)); + query.addNotIn(Contact.PROPERTY_COMMENT, Sets.newHashSet("", null)); } if (filter.isCommentCompanyDefinedOnly()) { - query.addNotIn(Contact.PROPERTY_COMMENT_COORDINATOR, ImmutableSet.of("", null)); + query.addNotIn(Contact.PROPERTY_COMMENT_COORDINATOR, Sets.newHashSet("", null)); } if (filter.isCommentAdminDefinedOnly()) { - query.addNotIn(Contact.PROPERTY_COMMENT_ADMIN, ImmutableSet.of("", null)); + query.addNotIn(Contact.PROPERTY_COMMENT_ADMIN, Sets.newHashSet("", null)); } if (CollectionUtils.isNotEmpty(filter.getCompanyAcceptations())) {