remm        2003/07/18 15:25:53

  Modified:    catalina/src/share/org/apache/catalina/valves
                        ErrorReportValve.java
  Log:
  - Print out partial stack traces (on JDK 1.4; older JDKs would need substring
    based hacks, and I'm not sure it's a very good idea ...).
  
  Revision  Changes    Path
  1.5       +13 -10    
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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ErrorReportValve.java     21 Jun 2003 17:37:17 -0000      1.4
  +++ ErrorReportValve.java     18 Jul 2003 22:25:52 -0000      1.5
  @@ -79,6 +79,9 @@
   import javax.servlet.http.Cookie;
   import javax.servlet.http.HttpServletRequest;
   import javax.servlet.http.HttpServletResponse;
  +
  +import org.apache.tomcat.util.compat.JdkCompat;
  +
   import org.apache.catalina.Container;
   import org.apache.catalina.Globals;
   import org.apache.catalina.HttpRequest;
  @@ -319,20 +322,20 @@
           sb.append("</u></p>");
   
           if (throwable != null) {
  -            StringWriter stackTrace = new StringWriter();
  -            throwable.printStackTrace(new PrintWriter(stackTrace));
  +            String stackTrace = JdkCompat.getJdkCompat()
  +                .getPartialServletStackTrace(throwable);
               sb.append("<p><b>");
               sb.append(sm.getString("errorReportValve.exception"));
               sb.append("</b> <pre>");
  -            sb.append(stackTrace.toString());
  +            sb.append(stackTrace);
               sb.append("</pre></p>");
               while (rootCause != null) {
  -                stackTrace = new StringWriter();
  -                rootCause.printStackTrace(new PrintWriter(stackTrace));
  +                stackTrace = JdkCompat.getJdkCompat()
  +                    .getPartialServletStackTrace(rootCause);
                   sb.append("<p><b>");
                   sb.append(sm.getString("errorReportValve.rootCause"));
                   sb.append("</b> <pre>");
  -                sb.append(stackTrace.toString());
  +                sb.append(stackTrace);
                   sb.append("</pre></p>");
   
                   /* In case root cause is somehow heavily nested */
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to