SYMMETRICDS-570

JumpMind · Jan 3, 2012 · 0613cb8 · 0613cb8
1 parent 3c3666a
commit 0613cb8
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataService.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataService.java
@@ -622,10 +622,15 @@ public long findMaxDataEventDataId() {
         return jdbcTemplate.queryForLong(getSql("selectMaxDataEventDataIdSql"));
     }
 
-    public void insertDataGap(DataGap gap) {
-        jdbcTemplate.update(getSql("insertDataGapSql"), new Object[] { DataGap.Status.GP.name(),
-                AppUtils.getHostName(), gap.getStartId(), gap.getEndId() }, new int[] {
+    public void insertDataGap(DataGap gap) {
+        try {
+        jdbcTemplate.update(getSql("insertDataGapSql"), new Object[] { DataGap.Status.GP.name(),
+                AppUtils.getHostName(), gap.getStartId(), gap.getEndId() }, new int[] {
                 Types.VARCHAR, Types.VARCHAR, Types.NUMERIC, Types.NUMERIC });
+        } catch (DataIntegrityViolationException ex) {
+            log.warn("GapAlreadyExisted", gap.getStartId(), gap.getEndId());
+            updateDataGap(gap,  DataGap.Status.GP);
+        }
     }
 
     public void updateDataGap(DataGap gap, DataGap.Status status) {