Author: remy.maucherat(a)jboss.com
Date: 2008-08-18 08:47:01 -0400 (Mon, 18 Aug 2008)
New Revision: 744
Modified:
trunk/java/org/apache/catalina/connector/MapperListener.java
trunk/webapps/docs/changelog.xml
Log:
- Fix possible NPE on shutdown.
Modified: trunk/java/org/apache/catalina/connector/MapperListener.java
===================================================================
--- trunk/java/org/apache/catalina/connector/MapperListener.java 2008-08-18 04:04:18 UTC
(rev 743)
+++ trunk/java/org/apache/catalina/connector/MapperListener.java 2008-08-18 12:47:01 UTC
(rev 744)
@@ -156,9 +156,10 @@
public void destroy() {
try {
- ObjectName objectName = new ObjectName(
- "JMImplementation:type=MBeanServerDelegate");
- mBeanServer.removeNotificationListener(objectName, this);
+ ObjectName objectName = new
ObjectName("JMImplementation:type=MBeanServerDelegate");
+ if (mBeanServer != null) {
+ mBeanServer.removeNotificationListener(objectName, this);
+ }
} catch (Exception e) {
log.warn("Error unregistering MBeanServerDelegate", e);
}
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2008-08-18 04:04:18 UTC (rev 743)
+++ trunk/webapps/docs/changelog.xml 2008-08-18 12:47:01 UTC (rev 744)
@@ -42,6 +42,9 @@
<add>
<bug>41407</bug>: Add support for CLIENT-CERT to the JASS Realm.
(markt)
</add>
+ <fix>
+ NPE on shutdown when an error occurs starting connectors. (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">