From 1eb84f3e34c5f31f99d567c0a453e514f3214a15 Mon Sep 17 00:00:00 2001
From: Diego Pino Garcia <dpino@igalia.com>
Date: Tue, 17 Nov 2009 19:42:17 +0100
Subject: [PATCH]  ItEr35S07ValidacionEProbasFuncionaisItEr34S08: [Bug #89]
 Problem adding new criterion

---
 .../business/common/daos/GenericDAOHibernate.java         | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/common/daos/GenericDAOHibernate.java b/navalplanner-business/src/main/java/org/navalplanner/business/common/daos/GenericDAOHibernate.java
index f9c822ed2..d8c30de54 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/common/daos/GenericDAOHibernate.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/common/daos/GenericDAOHibernate.java
@@ -79,9 +79,15 @@ public class GenericDAOHibernate<E extends BaseEntity,
         return sessionFactory.getCurrentSession();
     }
 
+    /**
+     * It's necessary to save and validate later.
+     *
+     * Validate may retrieve the entity from DB and put it into the Session, which can eventually lead to
+     * a NonUniqueObject exception. Save works here to reattach the object as well as saving.
+     */
     public void save(E entity) throws ValidationException {
-        entity.validate();
         getSession().saveOrUpdate(entity);
+        entity.validate();
     }
 
     public void reattachUnmodifiedEntity(E entity) {