Improve error reporting by labeling line/column numbers

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

diff --git a/java/org/apache/jasper/compiler/DefaultErrorHandler.java b/java/org/apache/jasper/compiler/DefaultErrorHandler.java
index f12ff5f..c550822 100644 (file)
--- a/java/org/apache/jasper/compiler/DefaultErrorHandler.java
+++ b/java/org/apache/jasper/compiler/DefaultErrorHandler.java
@@ -38,8 +38,8 @@ class DefaultErrorHandler implements ErrorHandler {
     @Override
     public void jspError(String fname, int line, int column, String errMsg,
             Exception ex) throws JasperException {
-        throw new JasperException(fname + "(" + line + "," + column + ")"
-                + " " + errMsg, ex);
+        throw new JasperException(fname + "(line: " + line + ", column: " +
+                column + ")" + " " + errMsg, ex);
     }
     
     /*

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index bdf44f3..19474d8 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -57,9 +57,9 @@
         separated by commas. (kkolinko)
       </update>
       <add>
-        <bug>50306</bug>: New StuckThreadDetectionValve to detect requests that take a 
-        long time to process, which might indicate that their processing threads are 
-        stuck. Based on a patch provided by TomLu. (slaurent)
+        <bug>50306</bug>: New StuckThreadDetectionValve to detect requests that
+        take a long time to process, which might indicate that their processing
+        threads are stuck. Based on a patch provided by TomLu. (slaurent)
       </add>
     </changelog>
   </subsection>
@@ -71,6 +71,14 @@
       </fix>
     </changelog>
   </subsection>
+  <subsection name="Jasper">
+    <changelog>
+      <add>
+        Label JSP/tag file line and column numbers when reporting errors since
+        it may not be immediately obvious what the numbers represent. (markt)
+      </add>
+    </changelog>
+  </subsection>
   <subsection name="Web applications">
     <changelog>
       <update>