[jboss-cvs] JBossAS SVN: r63811 - trunk/cluster/src/main/org/jboss/ejb/plugins.

[jboss-cvs-commits at lists.jboss.org]

Author: bstansberry at jboss.com
Date: 2007-07-03 23:40:13 -0400 (Tue, 03 Jul 2007)
New Revision: 63811

Modified:
   trunk/cluster/src/main/org/jboss/ejb/plugins/CleanShutdownInterceptor.java
Log:
Ignore duplicate stopping notification; avoid NPE

Modified: trunk/cluster/src/main/org/jboss/ejb/plugins/CleanShutdownInterceptor.java
===================================================================
--- trunk/cluster/src/main/org/jboss/ejb/plugins/CleanShutdownInterceptor.java	2007-07-04 03:38:44 UTC (rev 63810)
+++ trunk/cluster/src/main/org/jboss/ejb/plugins/CleanShutdownInterceptor.java	2007-07-04 03:40:13 UTC (rev 63811)
@@ -378,6 +378,14 @@
 
    protected void containerIsAboutToStop ()
    {
+      // Distinction between between JMX proxies and underlying services seems
+      // to lead to a 2nd STOPPING event; ignore it or we get an NPE
+      if (ejbModule == null)
+      {
+         log.debug("Received STOPPING notification after container already set to null; ignoring");
+         return;
+      }
+      
       log.debug ("Container about to stop: disabling HA-RMI access to bean from interceptor");
       
       // This is bad: we should have some kind of code (manager) associated