From 73fbd7b969e9c81bffa3a8d4b35e8cc73b2d07c3 Mon Sep 17 00:00:00 2001 From: Susana Montes Pedreira Date: Tue, 10 May 2011 19:30:52 +0200 Subject: [PATCH] [Bug #1002] it catchs HibernateOptimisticLockingFailureException in validator method of the orderElementTemplate Entity. It is caught in the validator. Otherwise it would be wraped by hibernate and would bypass the automatic handling of OptimisttcLockingFailureExceptions FEA: ItEr74S04BugFixing --- .../business/templates/entities/OrderElementTemplate.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderElementTemplate.java b/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderElementTemplate.java index dde331df7..40a51b61b 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderElementTemplate.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderElementTemplate.java @@ -62,6 +62,7 @@ import org.navalplanner.business.requirements.entities.DirectCriterionRequiremen import org.navalplanner.business.requirements.entities.IndirectCriterionRequirement; import org.navalplanner.business.templates.daos.IOrderElementTemplateDAO; import org.navalplanner.business.trees.ITreeNode; +import org.springframework.orm.hibernate3.HibernateOptimisticLockingFailureException; /** * @author Óscar González Fernández @@ -479,6 +480,8 @@ public abstract class OrderElementTemplate extends BaseEntity implements } catch (NonUniqueResultException e) { return false; + } catch (HibernateOptimisticLockingFailureException e) { + return true; } } }