remm 2003/07/19 03:14:18
Modified: catalina/src/share/org/apache/catalina/valves
ErrorReportValve.java LocalStrings.properties
LocalStrings_fr.properties
Log:
- Add a note about the full trace being available in the logs, when one or more
exceptions are displayed.
Revision Changes Path
1.6 +14 -6
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java
Index: ErrorReportValve.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ErrorReportValve.java 18 Jul 2003 22:25:52 -0000 1.5
+++ ErrorReportValve.java 19 Jul 2003 10:14:17 -0000 1.6
@@ -322,6 +322,7 @@
sb.append("</u></p>");
if (throwable != null) {
+
String stackTrace = JdkCompat.getJdkCompat()
.getPartialServletStackTrace(throwable);
sb.append("<p><b>");
@@ -329,6 +330,7 @@
sb.append("</b> <pre>");
sb.append(stackTrace);
sb.append("</pre></p>");
+
while (rootCause != null) {
stackTrace = JdkCompat.getJdkCompat()
.getPartialServletStackTrace(rootCause);
@@ -337,13 +339,19 @@
sb.append("</b> <pre>");
sb.append(stackTrace);
sb.append("</pre></p>");
-
- /* In case root cause is somehow heavily nested */
+ // In case root cause is somehow heavily nested
if (rootCause instanceof ServletException)
rootCause = ((ServletException) rootCause).getRootCause();
else
rootCause = null;
}
+
+ sb.append("<p><b>");
+ sb.append(sm.getString("errorReportValve.note"));
+ sb.append("</b> <u>");
+ sb.append(sm.getString("errorReportValve.rootCauseInLogs"));
+ sb.append("</u></p>");
+
}
sb.append("<HR size=\"1\" noshade>");
1.4 +2 -0
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/LocalStrings.properties
Index: LocalStrings.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/LocalStrings.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LocalStrings.properties 22 Feb 2003 14:56:35 -0000 1.3
+++ LocalStrings.properties 19 Jul 2003 10:14:17 -0000 1.4
@@ -22,6 +22,8 @@
errorReportValve.description=description
errorReportValve.exception=exception
errorReportValve.rootCause=root cause
+errorReportValve.note=note
+errorReportValve.rootCauseInLogs=The full stack trace of the root cause is
available in the Tomcat logs.
# HTTP status reports
http.100=The client may continue ({0}).
1.3 +2 -0
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/LocalStrings_fr.properties
Index: LocalStrings_fr.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/LocalStrings_fr.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LocalStrings_fr.properties 18 Jul 2003 22:31:55 -0000 1.2
+++ LocalStrings_fr.properties 19 Jul 2003 10:14:17 -0000 1.3
@@ -19,6 +19,8 @@
errorReportValve.description=description
errorReportValve.exception=exception
errorReportValve.rootCause=cause mère
+errorReportValve.note=note
+errorReportValve.rootCauseInLogs=La trace complète de la cause mère de cette erreur
est disponible dans les fichiers journaux de Tomcat.
# HTTP status reports
http.100=Le client peut continuer ({0}).
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
