0042541: EDL request status can be not updated properly under some circumnstances

diff --git a/src/org/openbravo/externaldata/integration/process/ProcessRequest.java b/src/org/openbravo/externaldata/integration/process/ProcessRequest.java
--- a/src/org/openbravo/externaldata/integration/process/ProcessRequest.java
+++ b/src/org/openbravo/externaldata/integration/process/ProcessRequest.java
@@ -505,15 +505,10 @@
           endProcess(config);
         }
       }
-    } catch (OBException e) {
-      log4j.error("Error processing request line", e);
-      error = true;
-      status = STATUS_ERROR;
-      errorMsg = e.getMessage();
     } catch (Exception e) {
       try {
-        SessionHandler.getInstance().getConnection().rollback();
-      } catch (SQLException e1) {
+        OBDal.getInstance().rollbackAndClose();
+      } catch (Exception e1) {
         log4j.error("Error while doing rollback.", e1);
       }
       log4j.error("Unhandled exception processing request line", e);
@@ -537,29 +532,35 @@
   private void updateRequestLineAndRequestStatus(String status, String errorMsg,
       Date executionDate) {
     ReentrantLock lock = null;
+    String requestId = request.getId();
+    String requestLineId = requestLine != null ? requestLine.getId() : null;
     try {
       lock = lockByEdlProcess();
 
+      if (STATUS_ERROR.equals(status)) {
+        // reload the EDL request because the transaction has been rolled back due to an error
+        request = OBDal.getInstance().get(OBEDLRequest.class, requestId);
+      }
+
       request.setExecutionDate(executionDate);
-      if (requestLine != null) {
-        OBDal.getInstance()
-            .getSession()
-            .buildLockRequest(LockOptions.NONE)
-            .lock(OBEDLRequestLine.ENTITY_NAME, requestLine);
+      if (requestLineId != null) {
+        requestLine = OBDal.getInstance().get(OBEDLRequestLine.class, requestLineId);
         requestLine.setStatus(status);
         requestLine.setErrorMsg(EDLUtils.getSafeEDLRequestLineErrorMessage(errorMsg));
+      }
 
-        OBDal.getInstance().save(requestLine);
-        OBDal.getInstance().flush();
-      }
       doCommit();
       updateRequestStatus();
       doCommit();
+    } catch (Exception ex) {
+      log4j.error("Error updating status: Request = {}, Request Line = {}, Status = {}", requestId,
+          requestLineId, status, ex);
     } finally {
       if (lock != null) {
         unlockByEdlProcess(lock);
       }
     }
+
   }
 
   private void unlockByEdlProcess(ReentrantLock lock) {

diff --git a/src/org/openbravo/externaldata/integration/examples/FailureEventHandler.java b/src/org/openbravo/externaldata/integration/examples/FailureEventHandler.java
new file mode 100644
--- /dev/null
+++ b/src/org/openbravo/externaldata/integration/examples/FailureEventHandler.java
@@ -0,0 +1,41 @@
+package org.openbravo.externaldata.integration.examples;
+
+import javax.enterprise.event.Observes;
+
+import org.openbravo.base.exception.OBException;
+import org.openbravo.base.model.Entity;
+import org.openbravo.base.model.ModelProvider;
+import org.openbravo.client.kernel.event.EntityPersistenceEventObserver;
+import org.openbravo.client.kernel.event.EntityUpdateEvent;
+import org.openbravo.model.common.uom.UOM;
+
+public class FailureEventHandler extends EntityPersistenceEventObserver {
+
+  private static Entity[] entities = { //
+      ModelProvider.getInstance().getEntity(UOM.class) };
+
+  @Override
+  protected Entity[] getObservedEntities() {
+    return entities;
+  }
+
+  public void onUpdate(@Observes EntityUpdateEvent event) {
+    if (!isValidEvent(event)) {
+      return;
+    }
+    UOM uom = (UOM) event.getTargetInstance();
+    if (uom.getName().equals("Test7")) {
+      throw new OBException("FAIL");
+    }
+  }
+
+  public void onSave(@Observes EntityUpdateEvent event) {
+    if (!isValidEvent(event)) {
+      return;
+    }
+    UOM uom = (UOM) event.getTargetInstance();
+    if (uom.getName().equals("Test7")) {
+      throw new OBException("FAIL");
+    }
+  }
+}