0036037: PostImportEntry hook is getting executed even if the record goes to Errors While Importing window

diff -r 51504365e8e1 src/org/openbravo/mobile/core/process/DataSynchronizationProcess.java
--- a/src/org/openbravo/mobile/core/process/DataSynchronizationProcess.java	Thu May 18 12:13:27 2017 +0200
+++ b/src/org/openbravo/mobile/core/process/DataSynchronizationProcess.java	Mon May 22 19:32:12 2017 +0200
@@ -82,7 +82,7 @@
 
   @Override
   public JSONObject exec(JSONObject jsonsent) throws JSONException, ServletException {
-    return exec(jsonsent, false);
+    return exec(jsonsent, true);
   }
 
   protected String getImportQualifier() {
diff -r 51504365e8e1 src/org/openbravo/mobile/core/process/MobileImportEntryProcessorRunnable.java
--- a/src/org/openbravo/mobile/core/process/MobileImportEntryProcessorRunnable.java	Thu May 18 12:13:27 2017 +0200
+++ b/src/org/openbravo/mobile/core/process/MobileImportEntryProcessorRunnable.java	Mon May 22 19:32:12 2017 +0200
@@ -26,7 +26,7 @@
  */
 public abstract class MobileImportEntryProcessorRunnable extends ImportEntryProcessRunnable {
 
-  protected void processEntry(ImportEntry importEntry) throws Exception {
+  protected JSONObject doProcessEntry(ImportEntry importEntry) throws Exception {
     OBContext.setAdminMode(false);
     String importEntryId = null;
     String json = null;
@@ -39,10 +39,11 @@
     final JSONProcessSimple jsonProcess = WeldUtils
         .getInstanceFromStaticBeanManager(getJSONProcessorClass());
     jsonProcess.setImportEntryId(importEntryId);
-    jsonProcess.exec(new JSONObject(json));
+    JSONObject result = jsonProcess.exec(new JSONObject(json));
     if (SessionHandler.isSessionHandlerPresent()) {
       OBDal.getInstance().commitAndClose();
     }
+    return result;
   }
 
   /**

diff -r 0eb140120f4e src/org/openbravo/service/importprocess/ImportEntryProcessor.java
--- a/src/org/openbravo/service/importprocess/ImportEntryProcessor.java	Thu May 18 12:30:55 2017 +0200
+++ b/src/org/openbravo/service/importprocess/ImportEntryProcessor.java	Mon May 22 19:32:58 2017 +0200
@@ -34,6 +34,7 @@
 import javax.inject.Inject;
 
 import org.apache.log4j.Logger;
+import org.codehaus.jettison.json.JSONObject;
 import org.openbravo.base.secureApp.VariablesSecureApp;
 import org.openbravo.client.kernel.RequestContext;
 import org.openbravo.dal.core.OBContext;
@@ -43,6 +44,7 @@
 import org.openbravo.database.SessionInfo;
 import org.openbravo.model.common.enterprise.Organization;
 import org.openbravo.service.importprocess.ImportEntryManager.ImportEntryProcessorSelector;
+import org.openbravo.service.json.JsonConstants;
 
 /**
  * The {@link ImportEntryProcessor} is responsible for importing/processing {@link ImportEntry}
@@ -367,12 +369,16 @@
             logger.debug("Processing entry " + localImportEntry.getIdentifier() + " " + typeOfData);
           }
 
-          processEntry(localImportEntry);
+          JSONObject result = doProcessEntry(localImportEntry);
 
           // Execute post process hooks.
-          for (ImportEntryPostProcessor importEntryPostProcessor : importEntryPostProcessors
-              .select(new ImportEntryProcessorSelector(typeOfData))) {
-            importEntryPostProcessor.afterProcessing(localImportEntry);
+          if (result == null
+              || result.getString(JsonConstants.RESPONSE_STATUS).equals(
+                  JsonConstants.RPCREQUEST_STATUS_SUCCESS)) {
+            for (ImportEntryPostProcessor importEntryPostProcessor : importEntryPostProcessors
+                .select(new ImportEntryProcessorSelector(typeOfData))) {
+              importEntryPostProcessor.afterProcessing(localImportEntry);
+            }
           }
 
           if (logger.isDebugEnabled()) {
@@ -524,6 +530,14 @@
      */
     protected abstract void processEntry(ImportEntry importEntry) throws Exception;
 
+    protected JSONObject doProcessEntry(ImportEntry importEntry) throws Exception {
+      processEntry(importEntry);
+      JSONObject jsonResponse = new JSONObject();
+      jsonResponse.put(JsonConstants.RESPONSE_STATUS, JsonConstants.RPCREQUEST_STATUS_SUCCESS);
+      jsonResponse.put("result", "0");
+      return jsonResponse;
+    }
+
     public void setImportEntryManager(ImportEntryManager importEntryManager) {
       this.importEntryManager = importEntryManager;
     }

diff -r 51504365e8e1 src/org/openbravo/mobile/core/process/MobileImportEntryProcessorRunnable.java
--- a/src/org/openbravo/mobile/core/process/MobileImportEntryProcessorRunnable.java	Thu May 18 12:13:27 2017 +0200
+++ b/src/org/openbravo/mobile/core/process/MobileImportEntryProcessorRunnable.java	Tue May 23 15:27:48 2017 +0200
@@ -27,6 +27,10 @@
 public abstract class MobileImportEntryProcessorRunnable extends ImportEntryProcessRunnable {
 
   protected void processEntry(ImportEntry importEntry) throws Exception {
+    throw new OBException("Should not be used, doProcessEntry has been implemented directly");
+  }
+
+  protected JSONObject doProcessEntry(ImportEntry importEntry) throws Exception {
     OBContext.setAdminMode(false);
     String importEntryId = null;
     String json = null;