Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41673

Use platform line endings when reporting error messages

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1156304 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/jasper/compiler/DefaultErrorHandler.java b/java/org/apache/jasper/compiler/DefaultErrorHandler.java
index 444d965..2b54e51 100644 (file)
--- a/java/org/apache/jasper/compiler/DefaultErrorHandler.java
+++ b/java/org/apache/jasper/compiler/DefaultErrorHandler.java
@@ -17,6 +17,7 @@
 
 package org.apache.jasper.compiler;
 
+import org.apache.jasper.Constants;
 import org.apache.jasper.JasperException;
 
 /**
@@ -76,24 +77,28 @@ class DefaultErrorHandler implements ErrorHandler {
                 args = new Object[] {
                         Integer.valueOf(details[i].getJspBeginLineNumber()), 
                         details[i].getJspFileName() };
-                buf.append("\n\n");
+                buf.append(Constants.NEWLINE);
+                buf.append(Constants.NEWLINE);
                 buf.append(Localizer.getMessage("jsp.error.single.line.number",
                         args));
-                buf.append("\n");
+                buf.append(Constants.NEWLINE);
                 buf.append(details[i].getErrorMessage());
-                buf.append("\n");
+                buf.append(Constants.NEWLINE);
                 buf.append(details[i].getJspExtract());
             } else {
                 args = new Object[] {
                         Integer.valueOf(details[i].getJavaLineNumber()) };
-                buf.append("\n\n");
+                buf.append(Constants.NEWLINE);
+                buf.append(Constants.NEWLINE);
                 buf.append(Localizer.getMessage("jsp.error.java.line.number",
                         args));
-                buf.append("\n");
+                buf.append(Constants.NEWLINE);
                 buf.append(details[i].getErrorMessage());
             }
         }
-        buf.append("\n\nStacktrace:");
+        buf.append(Constants.NEWLINE);
+        buf.append(Constants.NEWLINE);
+        buf.append("Stacktrace:");
         throw new JasperException(
                 Localizer.getMessage("jsp.error.unable.compile") + ": " + buf);
     }

diff --git a/java/org/apache/jasper/compiler/ErrorDispatcher.java b/java/org/apache/jasper/compiler/ErrorDispatcher.java
index 395a54f..f360487 100644 (file)
--- a/java/org/apache/jasper/compiler/ErrorDispatcher.java
+++ b/java/org/apache/jasper/compiler/ErrorDispatcher.java
@@ -22,6 +22,7 @@ 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;
@@ -473,7 +474,7 @@ public class ErrorDispatcher {
             // Ignore messages preceding first error
             if (errMsgBuf != null) {
                 errMsgBuf.append(line);
-                errMsgBuf.append("\n");
+                errMsgBuf.append(Constants.NEWLINE);
             }
         }