You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4j-dev@logging.apache.org by ca...@apache.org on 2007/08/24 21:36:27 UTC
svn commit: r569491 - in /logging/log4j/companions/extras/trunk/src:
main/java/org/apache/log4j/xml/XSLTLayout.java
test/java/org/apache/log4j/rolling/SizeBasedRollingTest.java
Author: carnold
Date: Fri Aug 24 12:36:27 2007
New Revision: 569491
URL: http://svn.apache.org/viewvc?rev=569491&view=rev
Log:
XSLTLayout linefeed/SizeRolling test issue on Windows
Modified:
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/xml/XSLTLayout.java
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/rolling/SizeBasedRollingTest.java
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/xml/XSLTLayout.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/xml/XSLTLayout.java?rev=569491&r1=569490&r2=569491&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/xml/XSLTLayout.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/xml/XSLTLayout.java Fri Aug 24 12:36:27 2007
@@ -377,10 +377,10 @@
if (body.startsWith("<?xml ")) {
int endDecl = body.indexOf("?>");
if (endDecl != -1) {
- endDecl += 2;
- if (endDecl < body.length() && body.charAt(endDecl) == '\n') {
- endDecl++;
- }
+ for(endDecl += 2;
+ endDecl < body.length() &&
+ (body.charAt(endDecl) == '\n' || body.charAt(endDecl) == '\r');
+ endDecl++);
return body.substring(endDecl);
}
}
Modified: logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/rolling/SizeBasedRollingTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/rolling/SizeBasedRollingTest.java?rev=569491&r1=569490&r2=569491&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/rolling/SizeBasedRollingTest.java (original)
+++ logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/rolling/SizeBasedRollingTest.java Fri Aug 24 12:36:27 2007
@@ -246,6 +246,10 @@
* to the indexed files.
*/
public void test5() throws Exception {
+ //
+ // delete any stray files that might confuse test
+ new File("sizeBased-test5.2").delete();
+ new File("sizeBased-test5.3").delete();
PatternLayout layout = new PatternLayout("%m\n");
RollingFileAppender rfa = new RollingFileAppender();
rfa.setName("ROLLING");
@@ -268,7 +272,7 @@
root.addAppender(rfa);
//
- // put stray file about locked file
+ // put stray file above locked file
FileOutputStream os1 = new FileOutputStream("sizeBased-test5.1");
os1.close();
---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org