Cancel load should set end time on request_status

JumpMind · Feb 19, 2019 · 1933c3a · 1933c3a
1 parent c9fe611
commit 1933c3a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataService.java
@@ -540,16 +540,12 @@ public int updateTableReloadRequestsCancelled(long loadId) {
         int count = 0;
         try {
             transaction = sqlTemplate.startSqlTransaction();
+            Date now = new Date();
             count = transaction.prepareAndExecute(getSql("updateTableReloadStatusCancelled"),
                     new Object[] { 
-                            new Date(), loadId
+                            now, now, loadId
                             },
-                    new int[] { Types.TIMESTAMP,Types.NUMERIC});
-            transaction.prepareAndExecute(getSql("updateTableReloadStatusCancelled"),
-                    new Object[] { 
-                            new Date(), loadId
-                            },
-                    new int[] { Types.TIMESTAMP,Types.NUMERIC});
+                    new int[] { Types.TIMESTAMP,Types.TIMESTAMP,Types.NUMERIC});
             transaction.commit();
             return count;
         } catch (Error ex) {

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataServiceSqlMap.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataServiceSqlMap.java
@@ -136,7 +136,7 @@ public DataServiceSqlMap(IDatabasePlatform platform, Map<String, String> replace
                 + " where load_id = ?");
 
         putSql("updateTableReloadStatusCancelled", "update $(table_reload_status) set "
-                + " cancelled = 1, completed = 1, last_update_time = ? "
+                + " cancelled = 1, completed = 1, end_time = ?, last_update_time = ? "
                 + " where load_id = ?");
 
         // Note that the order by data_id is done appended in code