Merge branch '3.8' of https://github.com/JumpMind/symmetric-ds into 3.8

JumpMind · Nov 18, 2017 · cedbbf5 · cedbbf5
2 parents ec46ee7 + c43fd1c
commit cedbbf5
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/route/DataGapFastDetector.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/route/DataGapFastDetector.java
@@ -464,8 +464,8 @@ protected Map<DataGap, List<Long>> getDataIdMap() {
         return map;
     }
 
-    protected void fixOverlappingGaps(List<DataGap> gaps, ProcessInfo processInfo) {
-        List<DataGap> gapsCopy = new ArrayList<DataGap>(gaps);
+    protected void fixOverlappingGaps(List<DataGap> gapsToCheck, ProcessInfo processInfo) {
+        List<DataGap> gapsCopy = new ArrayList<DataGap>(gapsToCheck);
         boolean ok = true;
         try {
             ISqlTransaction transaction = null;
@@ -510,11 +510,12 @@ protected void fixOverlappingGaps(List<DataGap> gaps, ProcessInfo processInfo) {
                     prevGap = curGap;
                 }
                 transaction.commit();
-
                 if (!ok) {
                     printGapState();
-                }
-
+                    log.info("Fixed gaps: " + gapsCopy);
+                }   
+                gaps.clear();
+                gaps.addAll(gapsCopy);
             } catch (Error ex) {
                 if (transaction != null) {
                     transaction.rollback();
@@ -536,6 +537,7 @@ protected void fixOverlappingGaps(List<DataGap> gaps, ProcessInfo processInfo) {
         }
     }
 
+
     public Long mapRow(Row row) {
         return row.getLong("data_id");
     }