0005077: Spaces prevent conflict configuration from working

JumpMind · Aug 24, 2021 · dfabeb6 · dfabeb6
1 parent eb419c8
commit dfabeb6
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataLoaderService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataLoaderService.java
@@ -963,17 +963,17 @@ public ConflictNodeGroupLink mapRow(Row rs) {
             setting.setNodeGroupLink(configurationService.getNodeGroupLinkFor(
                     rs.getString("source_node_group_id"), rs.getString("target_node_group_id"),
                     false));
-            setting.setTargetChannelId(rs.getString("target_channel_id"));
-            setting.setTargetCatalogName(rs.getString("target_catalog_name"));
-            setting.setTargetSchemaName(rs.getString("target_schema_name"));
-            setting.setTargetTableName(rs.getString("target_table_name"));
+            setting.setTargetChannelId(StringUtils.trimToNull(rs.getString("target_channel_id")));
+            setting.setTargetCatalogName(StringUtils.trimToNull(rs.getString("target_catalog_name")));
+            setting.setTargetSchemaName(StringUtils.trimToNull(rs.getString("target_schema_name")));
+            setting.setTargetTableName(StringUtils.trimToNull(rs.getString("target_table_name")));
             setting.setDetectType(DetectConflict.valueOf(rs.getString("detect_type").toUpperCase()));
             setting.setResolveType(ResolveConflict.valueOf(rs.getString("resolve_type")
                     .toUpperCase()));
             setting.setPingBack(PingBack.valueOf(rs.getString("ping_back")));
             setting.setResolveChangesOnly(rs.getBoolean("resolve_changes_only"));
             setting.setResolveRowOnly(rs.getBoolean("resolve_row_only"));
-            setting.setDetectExpression(rs.getString("detect_expression"));
+            setting.setDetectExpression(StringUtils.trimToNull(rs.getString("detect_expression")));
             setting.setLastUpdateBy(rs.getString("last_update_by"));
             setting.setConflictId(rs.getString("conflict_id"));
             setting.setCreateTime(rs.getDateTime("create_time"));