Author: markt Date: Mon Jun 11 09:37:00 2012 New Revision: 1348772 URL: http://svn.apache.org/viewvc?rev=1348772&view=rev Log: Throwable.getMessage() might be null
Modified: tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java Modified: tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java?rev=1348772&r1=1348771&r2=1348772&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java (original) +++ tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java Mon Jun 11 09:37:00 2012 @@ -140,10 +140,9 @@ public class ErrorReportValve extends Va } String message = RequestUtil.filter(response.getMessage()); - if (message == null) { - if (throwable != null) { - message = RequestUtil.filter(throwable.getMessage()); - } else { + if (message == null && throwable != null) { + message = RequestUtil.filter(throwable.getMessage()); + if (message == null) { message = ""; } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org