From 376788e056fe218c93422309357df3c18599f02a Mon Sep 17 00:00:00 2001 From: remm Date: Mon, 12 Mar 2007 14:34:39 +0000 Subject: [PATCH] - Cleanup of the message that is displayed. git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@517231 13f79535-47bb-0310-9956-ffa450edef68 --- .../jasper/compiler/DefaultErrorHandler.java | 24 ++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/java/org/apache/jasper/compiler/DefaultErrorHandler.java b/java/org/apache/jasper/compiler/DefaultErrorHandler.java index ae31d4275..97d543c02 100644 --- a/java/org/apache/jasper/compiler/DefaultErrorHandler.java +++ b/java/org/apache/jasper/compiler/DefaultErrorHandler.java @@ -67,17 +67,25 @@ class DefaultErrorHandler implements ErrorHandler { StringBuffer buf = new StringBuffer(); for (int i=0; i < details.length; i++) { - args = new Object[] { - new Integer(details[i].getJspBeginLineNumber()), - details[i].getJspFileName() }; - buf.append("\n\n"); - buf.append(Localizer.getMessage("jsp.error.single.line.number", - args)); - buf.append("\n"); - buf.append(details[i].getErrorMessage()); if (details[i].getJspBeginLineNumber() >= 0) { + args = new Object[] { + new Integer(details[i].getJspBeginLineNumber()), + details[i].getJspFileName() }; + buf.append("\n\n"); + buf.append(Localizer.getMessage("jsp.error.single.line.number", + args)); + buf.append("\n"); + buf.append(details[i].getErrorMessage()); buf.append("\n"); buf.append(details[i].getJspExtract()); + } else { + args = new Object[] { + new Integer(details[i].getJavaLineNumber()) }; + buf.append("\n\n"); + buf.append(Localizer.getMessage("jsp.error.java.line.number", + args)); + buf.append("\n"); + buf.append(details[i].getErrorMessage()); } } buf.append("\n\nStacktrace:"); -- 2.11.0