You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@velocity.apache.org by ge...@apache.org on 2003/10/26 11:16:10 UTC
cvs commit: jakarta-velocity/src/java/org/apache/velocity/test BaseTestCase.java
geirm 2003/10/26 02:16:10
Modified: src/java/org/apache/velocity/test BaseTestCase.java
Log:
Patch from Will Glass-Husain to fix bug 20992 - solves the problem of
dealing with extra CR's when checking out templates
Revision Changes Path
1.13 +2 -2 jakarta-velocity/src/java/org/apache/velocity/test/BaseTestCase.java
Index: BaseTestCase.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/test/BaseTestCase.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- BaseTestCase.java 4 May 2003 17:46:35 -0000 1.12
+++ BaseTestCase.java 26 Oct 2003 10:16:10 -0000 1.13
@@ -133,7 +133,7 @@
*/
protected String normalizeNewlines (String source)
{
- return perl.substitute("s/\r[\n]/\n/g", source);
+ return perl.substitute("s/\r[\r]?[\n]/\n/g", source);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: velocity-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: velocity-dev-help@jakarta.apache.org