0004609: Postgres Conflict Resolution fails to resolve

JumpMind · Nov 2, 2020 · 2e22ef9 · 2e22ef9
1 parent 925ded2
commit 2e22ef9
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/...in/java/org/jumpmind/symmetric/io/data/writer/AbstractDatabaseWriterConflictResolver.java b/...in/java/org/jumpmind/symmetric/io/data/writer/AbstractDatabaseWriterConflictResolver.java
@@ -104,7 +104,16 @@ public void needsResolved(AbstractDatabaseWriter writer, CsvData data, LoadStatu
                             }
 
                             if (isWinner) {
-                                performChainedFallbackForUpdate(writer, data, conflict, true);                               
+                                if (writer.getContext().getLastError() != null) {
+                                    performChainedFallbackForUpdate(writer, data, conflict, true);
+                                } else {
+                                    try {
+                                        // original update was 0 rows, so we'll try to update without conflict detection
+                                        performFallbackToUpdate(writer, data, conflict, false);
+                                    } catch (ConflictException e) {
+                                        performChainedFallbackForUpdate(writer, data, conflict, true);
+                                    }
+                                }
                             } else if (!conflict.isResolveRowOnly()) {
                                 throw new IgnoreBatchException();                              
                             }