Author: markt
Date: Fri Dec 5 15:30:18 2014
New Revision: 1643332
URL: http://svn.apache.org/r1643332
Log:
Follow up to r1643329
Replace System.getProperty("line.separator") with System.lineSeparator()
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/CoyoteWriter.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/security/Constants.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/security/SecurityListener.java
tomcat/tc8.0.x/trunk/java/org/apache/el/parser/ParseException.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/Constants.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/AntCompiler.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/DefaultErrorHandler.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/ErrorDispatcher.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/JavacErrorDetail.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/runtime/BodyContentImpl.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/runtime/JspWriterImpl.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
tomcat/tc8.0.x/trunk/java/org/apache/juli/JdkLoggerFormatter.java
tomcat/tc8.0.x/trunk/java/org/apache/juli/OneLineFormatter.java
tomcat/tc8.0.x/trunk/java/org/apache/juli/VerbatimFormatter.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/buildutil/CheckEol.java
tomcat/tc8.0.x/trunk/test/org/apache/juli/TestClassLoaderLogManager.java
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 5 15:30:18 2014
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642668,1642679,1642697,1642699,1643002,1643066,1643121,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642668,1642679,1642697,1642699,1643002,1643066,1643121,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/CoyoteWriter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/CoyoteWriter.java?rev=1643332&r1=1643331&r2=1643332&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/CoyoteWriter.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/CoyoteWriter.java
Fri Dec 5 15:30:18 2014
@@ -24,16 +24,12 @@ import java.io.PrintWriter;
*
* @author Remy Maucherat
*/
-public class CoyoteWriter
- extends PrintWriter {
+public class CoyoteWriter extends PrintWriter {
// -------------------------------------------------------------- Constants
- // No need for a do privileged block - every web app has permission to read
- // this by default
- private static final char[] LINE_SEP =
- System.getProperty("line.separator").toCharArray();
+ private static final char[] LINE_SEP =
System.lineSeparator().toCharArray();
// ----------------------------------------------------- Instance Variables
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/security/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/security/Constants.java?rev=1643332&r1=1643331&r2=1643332&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/security/Constants.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/security/Constants.java Fri
Dec 5 15:30:18 2014
@@ -20,6 +20,5 @@ public class Constants {
public static final String PACKAGE = "org.apache.catalina.security";
- public static final String LINE_SEP = System.getProperty("line.separator");
public static final String CRLF = "\r\n";
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/security/SecurityListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/security/SecurityListener.java?rev=1643332&r1=1643331&r2=1643332&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/security/SecurityListener.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/security/SecurityListener.java
Fri Dec 5 15:30:18 2014
@@ -170,7 +170,7 @@ public class SecurityListener implements
}
}
if (umask == null) {
- if (Constants.CRLF.equals(Constants.LINE_SEP)) {
+ if (Constants.CRLF.equals(System.lineSeparator())) {
// Probably running on Windows so no umask
if (log.isDebugEnabled()) {
log.debug(sm.getString("SecurityListener.checkUmaskSkip"));
Modified: tomcat/tc8.0.x/trunk/java/org/apache/el/parser/ParseException.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/el/parser/ParseException.java?rev=1643332&r1=1643331&r2=1643332&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/el/parser/ParseException.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/el/parser/ParseException.java Fri Dec
5 15:30:18 2014
@@ -89,7 +89,6 @@ public class ParseException extends Exce
private static String initialise(Token currentToken,
int[][] expectedTokenSequences,
String[] tokenImage) {
- String eol = System.getProperty("line.separator", "\n");
StringBuffer expected = new StringBuffer();
int maxSize = 0;
for (int i = 0; i < expectedTokenSequences.length; i++) {
@@ -102,7 +101,7 @@ public class ParseException extends Exce
if (expectedTokenSequences[i][expectedTokenSequences[i].length - 1] !=
0) {
expected.append("...");
}
- expected.append(eol).append(" ");
+ expected.append(System.lineSeparator()).append(" ");
}
String retval = "Encountered \"";
Token tok = currentToken.next;
@@ -119,22 +118,17 @@ public class ParseException extends Exce
tok = tok.next;
}
retval += "\" at line " + currentToken.next.beginLine + ", column " +
currentToken.next.beginColumn;
- retval += "." + eol;
+ retval += "." + System.lineSeparator();
if (expectedTokenSequences.length == 1) {
- retval += "Was expecting:" + eol + " ";
+ retval += "Was expecting:" + System.lineSeparator() + " ";
} else {
- retval += "Was expecting one of:" + eol + " ";
+ retval += "Was expecting one of:" + System.lineSeparator() + " ";
}
retval += expected.toString();
return retval;
}
/**
- * The end of line string for this machine.
- */
- protected String eol = System.getProperty("line.separator", "\n");
-
- /**
* Used to convert raw characters to their escaped version
* when these raw version cannot be used as part of an ASCII
* string literal.
Modified: tomcat/tc8.0.x/trunk/java/org/apache/jasper/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/jasper/Constants.java?rev=1643332&r1=1643331&r2=1643332&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/jasper/Constants.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/jasper/Constants.java Fri Dec 5
15:30:18 2014
@@ -93,11 +93,6 @@ public class Constants {
public static final int MAX_POOL_SIZE = 5;
/**
- * Platform specific new line sequence.
- */
- public static final String NEWLINE = System.getProperty("line.separator");
-
- /**
* The query parameter that causes the JSP engine to just
* pregenerated the servlet but not invoke it.
*/
Modified: tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/AntCompiler.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/AntCompiler.java?rev=1643332&r1=1643331&r2=1643332&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/AntCompiler.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/AntCompiler.java Fri
Dec 5 15:30:18 2014
@@ -101,7 +101,7 @@ public class AntCompiler extends Compile
@Override
protected void log(String message) {
reportBuf.append(message);
- reportBuf.append(Constants.NEWLINE);
+ reportBuf.append(System.lineSeparator());
}
protected String getReport() {
@@ -244,7 +244,7 @@ public class AntCompiler extends Compile
// Stop capturing the System.err output for this thread
String errorCapture = SystemLogHandler.unsetThread();
if (errorCapture != null) {
- errorReport.append(Constants.NEWLINE);
+ errorReport.append(System.lineSeparator());
errorReport.append(errorCapture);
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/DefaultErrorHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/DefaultErrorHandler.java?rev=1643332&r1=1643331&r2=1643332&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/DefaultErrorHandler.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/DefaultErrorHandler.java
Fri Dec 5 15:30:18 2014
@@ -17,7 +17,6 @@
package org.apache.jasper.compiler;
-import org.apache.jasper.Constants;
import org.apache.jasper.JasperException;
/**
@@ -77,28 +76,28 @@ class DefaultErrorHandler implements Err
args = new Object[] {
Integer.valueOf(details[i].getJspBeginLineNumber()),
details[i].getJspFileName() };
- buf.append(Constants.NEWLINE);
- buf.append(Constants.NEWLINE);
+ buf.append(System.lineSeparator());
+ buf.append(System.lineSeparator());
buf.append(Localizer.getMessage("jsp.error.single.line.number",
args));
- buf.append(Constants.NEWLINE);
+ buf.append(System.lineSeparator());
buf.append(details[i].getErrorMessage());
- buf.append(Constants.NEWLINE);
+ buf.append(System.lineSeparator());
buf.append(details[i].getJspExtract());
} else {
args = new Object[] {
Integer.valueOf(details[i].getJavaLineNumber()),
details[i].getJavaFileName() };
- buf.append(Constants.NEWLINE);
- buf.append(Constants.NEWLINE);
+ buf.append(System.lineSeparator());
+ buf.append(System.lineSeparator());
buf.append(Localizer.getMessage("jsp.error.java.line.number",
args));
- buf.append(Constants.NEWLINE);
+ buf.append(System.lineSeparator());
buf.append(details[i].getErrorMessage());
}
}
- buf.append(Constants.NEWLINE);
- buf.append(Constants.NEWLINE);
+ buf.append(System.lineSeparator());
+ buf.append(System.lineSeparator());
buf.append("Stacktrace:");
throw new JasperException(
Localizer.getMessage("jsp.error.unable.compile") + ": " + buf);
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/ErrorDispatcher.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/ErrorDispatcher.java?rev=1643332&r1=1643331&r2=1643332&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/ErrorDispatcher.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/ErrorDispatcher.java
Fri Dec 5 15:30:18 2014
@@ -22,7 +22,6 @@ import java.io.StringReader;
import java.net.MalformedURLException;
import java.util.ArrayList;
-import org.apache.jasper.Constants;
import org.apache.jasper.JasperException;
import org.apache.jasper.JspCompilationContext;
import org.xml.sax.SAXException;
@@ -342,7 +341,7 @@ public class ErrorDispatcher {
// Ignore messages preceding first error
if (errMsgBuf != null) {
errMsgBuf.append(line);
- errMsgBuf.append(Constants.NEWLINE);
+ errMsgBuf.append(System.lineSeparator());
}
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/JavacErrorDetail.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/JavacErrorDetail.java?rev=1643332&r1=1643331&r2=1643332&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/JavacErrorDetail.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/JavacErrorDetail.java
Fri Dec 5 15:30:18 2014
@@ -25,7 +25,6 @@ import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.List;
-import org.apache.jasper.Constants;
import org.apache.jasper.JspCompilationContext;
/**
@@ -126,7 +125,7 @@ public class JavacErrorDetail {
fragment.append(i+1);
fragment.append(": ");
fragment.append(jspLines[i]);
- fragment.append(Constants.NEWLINE);
+ fragment.append(System.lineSeparator());
}
jspExtract = fragment.toString();
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/jasper/runtime/BodyContentImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/jasper/runtime/BodyContentImpl.java?rev=1643332&r1=1643331&r2=1643332&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/jasper/runtime/BodyContentImpl.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/jasper/runtime/BodyContentImpl.java
Fri Dec 5 15:30:18 2014
@@ -39,8 +39,6 @@ import org.apache.jasper.Constants;
*/
public class BodyContentImpl extends BodyContent {
- private static final String LINE_SEPARATOR =
- System.getProperty("line.separator");
private static final boolean LIMIT_BUFFER =
Boolean.valueOf(System.getProperty("org.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER",
"false")).booleanValue();
@@ -172,9 +170,9 @@ public class BodyContentImpl extends Bod
@Override
public void newLine() throws IOException {
if (writer != null) {
- writer.write(LINE_SEPARATOR);
+ writer.write(System.lineSeparator());
} else {
- write(LINE_SEPARATOR);
+ write(System.lineSeparator());
}
}
Modified: tomcat/tc8.0.x/trunk/java/org/apache/jasper/runtime/JspWriterImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/jasper/runtime/JspWriterImpl.java?rev=1643332&r1=1643331&r2=1643332&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/jasper/runtime/JspWriterImpl.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/jasper/runtime/JspWriterImpl.java Fri
Dec 5 15:30:18 2014
@@ -330,9 +330,6 @@ public class JspWriterImpl extends JspWr
}
- private static final String lineSeparator =
- System.getProperty("line.separator");
-
/**
* Write a line separator. The line separator string is defined by the
* system property <tt>line.separator</tt>, and is not necessarily a single
@@ -343,7 +340,7 @@ public class JspWriterImpl extends JspWr
@Override
public void newLine() throws IOException {
- write(lineSeparator);
+ write(System.lineSeparator());
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java?rev=1643332&r1=1643331&r2=1643332&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
Fri Dec 5 15:30:18 2014
@@ -33,7 +33,6 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import javax.servlet.jsp.tagext.TagInfo;
-import org.apache.jasper.Constants;
import org.apache.jasper.JasperException;
import org.apache.jasper.JspCompilationContext;
import org.apache.jasper.Options;
@@ -567,9 +566,9 @@ public class JspServletWrapper {
if (options.getDisplaySourceFragment()) {
return new JasperException(Localizer.getMessage
("jsp.exception", detail.getJspFileName(),
- "" + jspLineNumber) + Constants.NEWLINE +
- Constants.NEWLINE + detail.getJspExtract() +
- Constants.NEWLINE + Constants.NEWLINE +
+ "" + jspLineNumber) + System.lineSeparator() +
+ System.lineSeparator() +
detail.getJspExtract() +
+ System.lineSeparator() +
System.lineSeparator() +
"Stacktrace:", ex);
}
Modified: tomcat/tc8.0.x/trunk/java/org/apache/juli/JdkLoggerFormatter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/juli/JdkLoggerFormatter.java?rev=1643332&r1=1643331&r2=1643332&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/juli/JdkLoggerFormatter.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/juli/JdkLoggerFormatter.java Fri Dec
5 15:30:18 2014
@@ -14,14 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.juli;
import java.util.logging.Formatter;
import java.util.logging.LogRecord;
-
-
/**
* A more compact formatter.
*
@@ -42,8 +39,6 @@ import java.util.logging.LogRecord;
*/
public class JdkLoggerFormatter extends Formatter {
- private static final String LINE_SEP =
System.getProperty("line.separator");
-
// values from JDK Level
public static final int LOG_LEVEL_TRACE = 400;
public static final int LOG_LEVEL_DEBUG = 500;
@@ -96,7 +91,7 @@ public class JdkLoggerFormatter extends
// Append stack trace if not null
if(t != null) {
- buf.append(LINE_SEP);
+ buf.append(System.lineSeparator());
java.io.StringWriter sw= new java.io.StringWriter(1024);
java.io.PrintWriter pw= new java.io.PrintWriter(sw);
@@ -105,9 +100,8 @@ public class JdkLoggerFormatter extends
buf.append(sw.toString());
}
- buf.append(LINE_SEP);
+ buf.append(System.lineSeparator());
// Print to the appropriate destination
return buf.toString();
}
-
}
Modified: tomcat/tc8.0.x/trunk/java/org/apache/juli/OneLineFormatter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/juli/OneLineFormatter.java?rev=1643332&r1=1643331&r2=1643332&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/juli/OneLineFormatter.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/juli/OneLineFormatter.java Fri Dec 5
15:30:18 2014
@@ -38,8 +38,7 @@ import java.util.logging.LogRecord;
*/
public class OneLineFormatter extends Formatter {
- private static final String LINE_SEP =
System.getProperty("line.separator");
- private static final String ST_SEP = LINE_SEP + " ";
+ private static final String ST_SEP = System.lineSeparator() + " ";
private static final String UNKONWN_THREAD_NAME = "Unknown thread with ID
";
private static final Object threadMxBeanLock = new Object();
private static volatile ThreadMXBean threadMxBean = null;
@@ -136,7 +135,7 @@ public class OneLineFormatter extends Fo
}
// New line for next record
- sb.append(LINE_SEP);
+ sb.append(System.lineSeparator());
return sb.toString();
}
Modified: tomcat/tc8.0.x/trunk/java/org/apache/juli/VerbatimFormatter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/juli/VerbatimFormatter.java?rev=1643332&r1=1643331&r2=1643332&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/juli/VerbatimFormatter.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/juli/VerbatimFormatter.java Fri Dec 5
15:30:18 2014
@@ -23,21 +23,19 @@ import java.util.logging.LogRecord;
/**
* Outputs the just the log message with no additional elements. Stack traces
* are not logged. Log messages are separated by
- * <code>System.getProperty("line.separator")</code>. This is intended for use
+ * <code>System.lineSeparator()</code>. This is intended for use
* by access logs and the like that need complete control over the output
* format.
*/
public class VerbatimFormatter extends Formatter {
- private static final String LINE_SEP =
System.getProperty("line.separator");
-
@Override
public String format(LogRecord record) {
// Timestamp
StringBuilder sb = new StringBuilder(record.getMessage());
// New line for next record
- sb.append(LINE_SEP);
+ sb.append(System.lineSeparator());
return sb.toString();
}
Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/buildutil/CheckEol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/buildutil/CheckEol.java?rev=1643332&r1=1643331&r2=1643332&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/buildutil/CheckEol.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/buildutil/CheckEol.java Fri Dec
5 15:30:18 2014
@@ -41,8 +41,6 @@ import org.apache.tools.ant.types.FileSe
*/
public class CheckEol extends Task {
- private static final String eoln = System.getProperty("line.separator");
-
/** The files to be checked */
private final List<FileSet> filesets = new LinkedList<>();
@@ -65,9 +63,9 @@ public class CheckEol extends Task {
public void execute() throws BuildException {
Mode mode = null;
- if ("\n".equals(eoln)) {
+ if ("\n".equals(System.lineSeparator())) {
mode = Mode.LF;
- } else if ("\r\n".equals(eoln)) {
+ } else if ("\r\n".equals(System.lineSeparator())) {
mode = Mode.CRLF;
} else {
log("Line ends check skipped, because OS line ends setting is
neither LF nor CRLF.",
@@ -132,7 +130,7 @@ public class CheckEol extends Task {
@Override
public String toString() {
- return eoln + file + ": uses " + value + " on line " + line;
+ return System.lineSeparator() + file + ": uses " + value + " on
line " + line;
}
}
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/juli/TestClassLoaderLogManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/juli/TestClassLoaderLogManager.java?rev=1643332&r1=1643331&r2=1643332&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/test/org/apache/juli/TestClassLoaderLogManager.java
(original)
+++ tomcat/tc8.0.x/trunk/test/org/apache/juli/TestClassLoaderLogManager.java
Fri Dec 5 15:30:18 2014
@@ -37,11 +37,10 @@ public class TestClassLoaderLogManager {
Assert.assertEquals("${", logManager.replace("${"));
Assert.assertEquals("${undefinedproperty}",
logManager.replace("${undefinedproperty}"));
Assert.assertEquals(
- System.getProperty("line.separator") + File.pathSeparator +
File.separator,
+ System.lineSeparator() + File.pathSeparator + File.separator,
logManager.replace("${line.separator}${path.separator}${file.separator}"));
Assert.assertEquals(
- "foo" + File.separator + "bar" +
System.getProperty("line.separator")
- + File.pathSeparator + "baz",
+ "foo" + File.separator + "bar" + System.lineSeparator() +
File.pathSeparator + "baz",
logManager.replace("foo${file.separator}bar${line.separator}${path.separator}baz"));
// BZ 51249
Assert.assertEquals(
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
