0005322: Conflict resolution batch with token parsing error when

newlines in data
JumpMind · Jun 1, 2022 · eefb81e · eefb81e
1 parent df2dec1
commit eefb81e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/load/DefaultDataLoaderFactory.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/load/DefaultDataLoaderFactory.java
@@ -238,6 +238,9 @@ protected String getPkCsvData(CsvData csvData, TriggerHistory hist) {
                                 pkCsvData = csvData.getCsvData(CsvData.ROW_DATA);
                             }
                         }
+                        if (pkCsvData != null) {
+                            pkCsvData = pkCsvData.replace("\n", "\\n").replace("\r", "\\r");
+                        }
                         return pkCsvData;
                     }
                 }, buildDatabaseWriterSettings(filters, errorHandlers, conflictSettings, resolvedData));

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
@@ -2667,7 +2667,9 @@ protected void reloadMissingForeignKeyRows(Data data, long batchId, String nodeI
 
     public void sendNewerDataToNode(ISqlTransaction transaction, String targetNodeId, String tableName, String pkCsvData, 
             Date minCreateTime, String winningNodeId) {
-
+        if (pkCsvData != null) {
+            pkCsvData = pkCsvData.replace("\\n", "\n").replace("\\r", "\r");
+        }
         List<Data> datas = transaction.query(getSql("selectData", "whereNewerData"), getDataMapper(),
                 new Object[] { tableName, pkCsvData + "%", pkCsvData, minCreateTime },
                 new int[] { Types.VARCHAR, Types.VARCHAR, Types.VARCHAR, Types.TIMESTAMP });