0001749: Incoming ProcessInfo is not marked as ERROR when a batch ERR…

…OR occurs. It is marked as OK.
JumpMind · Jun 6, 2014 · afdadad · afdadad
1 parent 896614e
commit afdadad
Showing 1 changed file with 21 additions and 2 deletions.
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataLoaderService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataLoaderService.java
@@ -216,6 +216,7 @@ public List<IncomingBatch> loadDataBatch(String batchData){
                 processInfo.setStatus(ProcessInfo.Status.OK);
                 return list;
             } catch (IOException ex) {
+                processInfo.setStatus(ProcessInfo.Status.ERROR);
                 throw new IoException();
             } catch (RuntimeException ex) {
                 processInfo.setStatus(ProcessInfo.Status.ERROR);
@@ -285,7 +286,12 @@ public void loadDataFromPull(Node remote, RemoteNodeStatus status) throws IOExce
                         sendAck(remote, local, localSecurity, list, transportManager);
                     }
                 }
-                processInfo.setStatus(ProcessInfo.Status.OK);
+
+                if (containsError(list)) {
+                    processInfo.setStatus(ProcessInfo.Status.ERROR);                    
+                } else {
+                    processInfo.setStatus(ProcessInfo.Status.OK);    
+                }
             } catch (RuntimeException e) {
                 processInfo.setStatus(ProcessInfo.Status.ERROR);
                 throw e;
@@ -315,6 +321,15 @@ public void loadDataFromPull(Node remote, RemoteNodeStatus status) throws IOExce
         }
     }
 
+    private boolean containsError(List<IncomingBatch> list) {
+        for (IncomingBatch incomingBatch : list) {
+            if (incomingBatch.getStatus() == Status.ER) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     /**
      * Load database from input stream and write acknowledgment to output
      * stream. This is used for a "push" request with a response of an
@@ -333,7 +348,11 @@ public void loadDataFromPush(Node sourceNode, InputStream in, OutputStream out)
                 processInfo.setStatus(ProcessInfo.Status.ACKING);
                 transportManager.writeAcknowledgement(out, sourceNode, list, local,
                         security != null ? security.getNodePassword() : null);
-                processInfo.setStatus(ProcessInfo.Status.OK);
+                if (containsError(list)) {
+                    processInfo.setStatus(ProcessInfo.Status.ERROR);                    
+                } else {
+                    processInfo.setStatus(ProcessInfo.Status.OK);
+                }
             } catch (RuntimeException e) {
                 processInfo.setStatus(ProcessInfo.Status.ERROR);
                 throw e;