RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ItEr26S13AltaEtiquetasTipoEtiqueta: [FixBug] LabelType name must be unique

Browse source
This commit is contained in:
Diego Pino Garcia 2009-09-16 19:51:45 +02:00 • committed by Javier Moran Rua
parent baba7f69a8
commit 4102ef90f1
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
navalplanner-business/src/main/java/org/navalplanner/business/labels/daos/LabelTypeDAO.java
View file

@ -31,9 +31,10 @@ public class LabelTypeDAO extends GenericDAOHibernate<LabelType, Long> implement
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = true)
public boolean isUnique(LabelType labelType) {
try {
return findUniqueByName(labelType).getId()
.equals(labelType.getId());
LabelType result = findUniqueByName(labelType);
return (result == null || result.getId().equals(labelType.getId()));
} catch (Exception e) {
e.printStackTrace();
return false;
}
}
@ -50,11 +51,11 @@ public class LabelTypeDAO extends GenericDAOHibernate<LabelType, Long> implement
private LabelType findUniqueByName(LabelType labelType)
throws InstanceNotFoundException {
List<LabelType> list = findByName(labelType);
if (list != null && list.size() != 1) {
if (list != null && list.size() > 1) {
throw new InstanceNotFoundException(labelType, LabelType.class
.getName());
}
return list.get(0);
return (list != null && list.size() > 0) ? list.get(0) : null;
}
@SuppressWarnings("unchecked")