From 3c60ed3aede143279361639c62f1e119761e9956 Mon Sep 17 00:00:00 2001 From: "Hicks, Josh" Date: Tue, 29 Dec 2020 13:30:46 -0500 Subject: [PATCH] 0004732: Do not worry about conflict winner in load only or log based target nodes --- .../data/writer/DefaultDatabaseWriterConflictResolver.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/writer/DefaultDatabaseWriterConflictResolver.java b/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/writer/DefaultDatabaseWriterConflictResolver.java index b28d7a9f8c..66f6f0c645 100644 --- a/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/writer/DefaultDatabaseWriterConflictResolver.java +++ b/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/writer/DefaultDatabaseWriterConflictResolver.java @@ -169,7 +169,10 @@ protected boolean isCaptureTimeNewer(Conflict conflict, AbstractDatabaseWriter w boolean isWinner = isLoadOnlyNode || existingTs == null || (loadingTs != null && (loadingTs.getTime() > existingTs.getTime() || (loadingTs.getTime() == existingTs.getTime() && writer.getContext().getBatch().getSourceNodeId().hashCode() > existingNodeId.hashCode()))); - writer.getContext().put(DatabaseConstants.IS_CONFLICT_WINNER, isWinner); + + if (!isLoadOnlyNode) { + writer.getContext().put(DatabaseConstants.IS_CONFLICT_WINNER, isWinner); + } if (log.isDebugEnabled()) { log.debug("{} row from batch {} with local time of {} and remote time of {} for table {} and pk of {}",