jfarcand 2003/08/18 12:41:56
Modified: catalina/src/share/org/apache/catalina/servlets
DefaultServlet.java
Log:
Fix NPE when getMessage returns null.
Revision Changes Path
1.17 +6 -5
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
Index: DefaultServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- DefaultServlet.java 29 Jul 2003 14:23:35 -0000 1.16
+++ DefaultServlet.java 18 Aug 2003 19:41:56 -0000 1.17
@@ -513,7 +513,8 @@
serveResource(request, response, true);
} catch( IOException ex ) {
// we probably have this check somewhere else too.
- if( ex.getMessage().indexOf("Broken pipe") >= 0 ) {
+ if( ex.getMessage() != null
+ && ex.getMessage().indexOf("Broken pipe") >= 0 ) {
// ignore it.
}
throw ex;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
