Author: remy.maucherat(a)jboss.com
Date: 2012-02-03 11:11:23 -0500 (Fri, 03 Feb 2012)
New Revision: 1944
Modified:
trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
Log:
AS7-2877: Add a possible fix for NPEs on some requests on stop.
Modified: trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
===================================================================
--- trunk/java/org/apache/catalina/connector/CoyoteAdapter.java 2012-02-03 15:22:01 UTC
(rev 1943)
+++ trunk/java/org/apache/catalina/connector/CoyoteAdapter.java 2012-02-03 16:11:23 UTC
(rev 1944)
@@ -346,6 +346,12 @@
}
+ // Check if the connector was stopped
+ if (connector.getService() == null) {
+ res.setStatus(500);
+ return;
+ }
+
if (connector.getXpoweredBy()) {
response.addHeader("X-Powered-By", X_POWERED_BY);
}
Show replies by date