From c59a89e24e2efc8156f2221779ab893cab5b0c72 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Thu, 29 Nov 2012 12:49:48 +0100
Subject: [PATCH] Avoid confirm close warning when you get a concurrent
 modification exception

When users clicks on save and the project has been already modified by other
user, it should be redirected to the page explaining the issue without having to
confirm that he is leaving the planning.

FEA: ItEr77S04BugFixing
---
 .../concurrentdetection/ConcurrentModificationController.java   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/concurrentdetection/ConcurrentModificationController.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/concurrentdetection/ConcurrentModificationController.java
index 1192995c2..b46a5c0a6 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/common/concurrentdetection/ConcurrentModificationController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/concurrentdetection/ConcurrentModificationController.java
@@ -25,6 +25,7 @@ import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.libreplan.web.common.ConfirmCloseUtil;
 import org.springframework.dao.OptimisticLockingFailureException;
 import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.Executions;
@@ -49,6 +50,7 @@ public class ConcurrentModificationController extends GenericForwardComposer {
                         "an OptimistLockingFailureException caused a disruption to an user",
                         exception);
         if (Executions.getCurrent() != null) {
+            ConfirmCloseUtil.resetConfirmClose();
             Executions.sendRedirect("/common/concurrent_modification.zul?back="
                     + backURL);
         } else {