0004719: MultiBatchStagingWriter writes "\r\n" on Windows for end of

lines in child batch staging files
JumpMind · Dec 23, 2020 · da8e02d · da8e02d
1 parent c91a588
commit da8e02d
Showing 1 changed file with 20 additions and 6 deletions.
diff --git a/...etric-core/src/main/java/org/jumpmind/symmetric/service/impl/MultiBatchStagingWriter.java b/...etric-core/src/main/java/org/jumpmind/symmetric/service/impl/MultiBatchStagingWriter.java
@@ -245,14 +245,21 @@ protected void checkSendChildRequests(OutgoingBatch parentBatch, IStagedResource
                     log.debug("About to copy batch {} to batch {}-{}", this.outgoingBatch.getNodeBatchId(), childRequest.getNodeId(), childBatchId);
                     BufferedReader reader = parentResource.getReader();
                     BufferedWriter writer = childResource.getWriter(memoryThresholdInBytes);
-                    String line = null;
                     try {
-                        while ((line = reader.readLine()) != null) {
-                            if (line.startsWith(CsvConstants.BATCH) || line.startsWith(CsvConstants.COMMIT)) {
-                                line = line.replace(Long.toString(outgoingBatch.getBatchId()), Long.toString(childBatchId));
+                        StringBuffer sb = new StringBuffer();
+                        int i;
+                        while ((i = reader.read()) != -1) {
+                            char c = (char) i;
+                            sb.append(c);
+                            if (c == '\n') {
+                                String s = replaceBatchId(sb.toString(), outgoingBatch.getBatchId(), childBatchId);
+                                writer.write(s);
+                                sb.delete(0, sb.length());
                             }
-                            writer.write(line);
-                            writer.write(System.lineSeparator());
+                        }
+                        if (sb.length() > 0) {
+                            String s = replaceBatchId(sb.toString(), outgoingBatch.getBatchId(), childBatchId);
+                            writer.write(s);
                         }
                     } catch (Exception e) {
                         throw new RuntimeException("Failed to copy batch " + this.outgoingBatch.getNodeBatchId() + " to batch " +
@@ -281,6 +288,13 @@ protected void checkSendChildRequests(OutgoingBatch parentBatch, IStagedResource
             }
         }
     }
+
+    private static String replaceBatchId(String s, long originalBatchId, long newBatchId) {
+        if (s.startsWith(CsvConstants.BATCH) || s.startsWith(CsvConstants.COMMIT)) {
+            s = s.replace(Long.toString(originalBatchId), Long.toString(newBatchId));
+        }
+        return s;
+    }
 
     @Override
     public void end(Table table) {