From 41c357a3c39c8549d9baccd566d29fd442a4450f Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <mrego@igalia.com>
Date: Wed, 11 May 2011 09:52:31 +0200
Subject: [PATCH] Revert "[Bug #1006] it catchs
 HibernateOptimisticLockingFailureException in validator method"

This reverts commit d3be77ff43c9d3653dcc9ccbee8bd0baeb099bf0.
---
 .../business/calendars/daos/CalendarExceptionTypeDAO.java  | 1 +
 .../business/calendars/entities/CalendarExceptionType.java | 7 -------
 .../web/exceptionDays/CalendarExceptionTypeModel.java      | 2 +-
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/daos/CalendarExceptionTypeDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/daos/CalendarExceptionTypeDAO.java
index e9ce22b8f..5e8915005 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/daos/CalendarExceptionTypeDAO.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/daos/CalendarExceptionTypeDAO.java
@@ -90,6 +90,7 @@ public class CalendarExceptionTypeDAO extends
     }
 
     @Override
+    @Transactional(readOnly = true)
     public CalendarExceptionType findByName(String name) throws InstanceNotFoundException {
         if (StringUtils.isBlank(name)) {
             throw new InstanceNotFoundException(null, CalendarExceptionType.class.getName());
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarExceptionType.java b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarExceptionType.java
index 0374df8a5..005b0990b 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarExceptionType.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarExceptionType.java
@@ -28,7 +28,6 @@ import java.util.EnumMap;
 import org.apache.commons.lang.BooleanUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.Validate;
-import org.hibernate.NonUniqueResultException;
 import org.hibernate.validator.AssertTrue;
 import org.hibernate.validator.NotNull;
 import org.navalplanner.business.calendars.daos.ICalendarExceptionTypeDAO;
@@ -37,7 +36,6 @@ import org.navalplanner.business.common.Registry;
 import org.navalplanner.business.common.exceptions.InstanceNotFoundException;
 import org.navalplanner.business.workingday.EffortDuration;
 import org.navalplanner.business.workingday.EffortDuration.Granularity;
-import org.springframework.orm.hibernate3.HibernateOptimisticLockingFailureException;
 
 /**
  * Type of an exception day.
@@ -173,12 +171,7 @@ public class CalendarExceptionType extends IntegrationEntity {
                 return calendarExceptionType.getId().equals(getId());
             } catch (InstanceNotFoundException e) {
                 return true;
-            } catch (NonUniqueResultException e) {
-                return false;
-            } catch (HibernateOptimisticLockingFailureException e) {
-                return true;
             }
-
         }
     }
 
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeModel.java
index ac5eb2256..b57cfcdde 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeModel.java
@@ -48,7 +48,7 @@ import org.zkoss.util.InvalidValueException;
  */
 @Service
 @Scope(BeanDefinition.SCOPE_PROTOTYPE)
-@OnConcurrentModification(goToPage = "/excetiondays/exceptionDays.zul")
+@OnConcurrentModification(goToPage = "/exceptionDays/exceptionDays.zul")
 public class CalendarExceptionTypeModel extends IntegrationEntityModel
         implements ICalendarExceptionTypeModel {