From e56e561b8e29be439fc5338acf3eb6d754df65bb Mon Sep 17 00:00:00 2001 From: Susana Montes Pedreira Date: Wed, 4 May 2011 13:54:12 +0200 Subject: [PATCH] [Bug #1003] it marks MachineModel with @OnConcurrentModification to intercept an OptimisticLockingFailureException. FEA: ItEr74S04BugFixing --- .../org/navalplanner/web/resources/machine/MachineModel.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineModel.java index ba6af9800..78646bfd7 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineModel.java @@ -58,6 +58,7 @@ import org.navalplanner.business.resources.entities.ResourceEnum; import org.navalplanner.business.resources.entities.Worker; import org.navalplanner.business.workreports.daos.IWorkReportLineDAO; import org.navalplanner.web.common.IntegrationEntityModel; +import org.navalplanner.web.common.concurrentdetection.OnConcurrentModification; import org.navalplanner.web.resources.search.ResourcePredicate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.BeanDefinition; @@ -71,6 +72,7 @@ import org.springframework.transaction.annotation.Transactional; */ @Service @Scope(BeanDefinition.SCOPE_PROTOTYPE) +@OnConcurrentModification(goToPage = "/resources/machine/machines.zul") public class MachineModel extends IntegrationEntityModel implements IMachineModel { private static Log LOG = LogFactory.getLog(MachineModel.class);