0004743: losing parent when both pk and uk lose

JumpMind · Jan 8, 2021 · f169b97 · f169b97
1 parent 25a688e
commit f169b97
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/...ain/java/org/jumpmind/symmetric/io/data/writer/DefaultDatabaseWriterConflictResolver.java b/...ain/java/org/jumpmind/symmetric/io/data/writer/DefaultDatabaseWriterConflictResolver.java
@@ -196,6 +196,13 @@ protected boolean isCaptureTimeNewer(Conflict conflict, AbstractDatabaseWriter w
         if (!isLoadOnlyNode) {
             writer.getContext().put(DatabaseConstants.IS_CONFLICT_WINNER, isWinner);
         }
+        if (!isWinner && !isWinnerByUk) {
+            Set<String> conflictLosingParentRows = writer.getWriterSettings().getConflictLosingParentRows();
+            if (conflictLosingParentRows != null) {
+                Map<String, String> rowDataMap = data.toColumnNameValuePairs(targetTable.getColumnNames(), CsvData.ROW_DATA);
+                conflictLosingParentRows.add(getConflictRowKey(targetTable, rowDataMap));
+            }
+        }
 
         if (log.isDebugEnabled()) {
             log.debug("{} row from batch {} with local time of {} and remote time of {} for table {} and pk of {}",
@@ -290,13 +297,6 @@ protected boolean isCaptureTimeNewerForUk(AbstractDatabaseWriter writer, CsvData
                 isWinner = existingTs == null || (loadingTs != null && (loadingTs.getTime() > existingTs.getTime() 
                         || (loadingTs.getTime() == existingTs.getTime() && writer.getContext().getBatch().getSourceNodeId().hashCode() > existingNodeId.hashCode())));
 
-                if (!isWinner) {
-                    Set<String> conflictLosingParentRows = writer.getWriterSettings().getConflictLosingParentRows();
-                    if (conflictLosingParentRows != null) {
-                        conflictLosingParentRows.add(getConflictRowKey(targetTable, rowDataMap));
-                    }
-                }
-
                 if (log.isDebugEnabled()) {
                     log.debug("{} row from batch {} with local time of {} and remote time of {} for table {} and uk of {}",
                             isWinner ? "Winning" : "Losing", writer.getContext().getBatch().getNodeBatchId(),