0003627: File conflict resolve extension point

JumpMind · Jul 17, 2018 · 17543ae · 17543ae
1 parent 6f3b8e4
commit 17543ae
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/model/FileTriggerRouter.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/model/FileTriggerRouter.java
@@ -101,6 +101,7 @@ public FileConflictStrategy getConflictStrategy() {
 
     public void setConflictStrategy(FileConflictStrategy conflictStrategy) {
         this.conflictStrategy = conflictStrategy;
+        this.conflictStrategyString = conflictStrategy.name();
     }
 
     public Date getCreateTime() {