svn commit: r1383270 - /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java

[davsclaus]

Author: davsclaus
Date: Tue Sep 11 07:38:10 2012
New Revision: 1383270

URL: http://svn.apache.org/viewvc?rev=1383270&view=rev
Log:
AMQ-4029: Check for null when unregister mbean.

Modified:
    
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java

Modified: 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java
URL: 
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java?rev=1383270&r1=1383269&r2=1383270&view=diff
==============================================================================
--- 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java
 (original)
+++ 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java
 Tue Sep 11 07:38:10 2012
@@ -174,7 +174,7 @@ public class ManagementContext implement
                 }
                 // stop naming service mbean
                 try {
-                    if 
(getMBeanServer().isRegistered(namingServiceObjectName)) {
+                    if (namingServiceObjectName != null && 
getMBeanServer().isRegistered(namingServiceObjectName)) {
                         LOG.debug("Stopping MBean {}", 
namingServiceObjectName);
                         getMBeanServer().invoke(namingServiceObjectName, 
"stop", null, null);
                         LOG.debug("Unregistering MBean {}", 
namingServiceObjectName);