From 640b7f41f039dd3ef8e41c5af7d86c201918d09a Mon Sep 17 00:00:00 2001 From: Antoine Levy-Lambert Date: Mon, 28 Jul 2003 00:22:00 +0000 Subject: [PATCH] Prevent \r\n from being changed to \r\r\n under Windows git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274962 13f79535-47bb-0310-9956-ffa450edef68 --- WHATSNEW | 2 ++ src/main/org/apache/tools/ant/taskdefs/Replace.java | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/WHATSNEW b/WHATSNEW index b14b82faf..9dc6d9a71 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -216,6 +216,8 @@ Fixed bugs: * ftp chmod failed when the remote system was UNIX and local system Windows Bugzilla Report 21865. +* replace would change \r\n into \r\r\n under Windows. + Other changes: -------------- * Six new Clearcase tasks added. diff --git a/src/main/org/apache/tools/ant/taskdefs/Replace.java b/src/main/org/apache/tools/ant/taskdefs/Replace.java index 29122a0e9..8ffe2ec64 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Replace.java +++ b/src/main/org/apache/tools/ant/taskdefs/Replace.java @@ -423,9 +423,13 @@ public class Replace extends MatchingTask { // line separators in values and tokens are "\n" // in order to compare with the file contents, replace them // as needed - String val = stringReplace(value.getText(), "\n", + String val = stringReplace(value.getText(), "\r\n", + "\n", false); + val = stringReplace(val, "\n", StringUtils.LINE_SEP, false); - String tok = stringReplace(token.getText(), "\n", + String tok = stringReplace(token.getText(), "\r\n", + "\n", false); + tok = stringReplace(tok, "\n", StringUtils.LINE_SEP, false); // for each found token, replace with value