Author: markt
Date: Mon Jun 11 09:37:55 2012
New Revision: 1348773
URL: http://svn.apache.org/viewvc?rev=1348773&view=rev
Log:
Throwable.getMessage() might be null
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1348772
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java?rev=1348773&r1=1348772&r2=1348773&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
Mon Jun 11 09:37:55 2012
@@ -164,10 +164,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: [email protected]
For additional commands, e-mail: [email protected]
