You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2013/10/27 13:57:05 UTC
svn commit: r1536124 -
/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagement.java
Author: kwall
Date: Sun Oct 27 12:57:04 2013
New Revision: 1536124
URL: http://svn.apache.org/r1536124
Log:
QPID-5241: [Java Broker] Prevent possibility of NPE during JMX plugin shutdown.
Modified:
qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagement.java
Modified: qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagement.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagement.java?rev=1536124&r1=1536123&r2=1536124&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagement.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagement.java Sun Oct 27 12:57:04 2013
@@ -230,7 +230,7 @@ public class JMXManagement extends Abstr
_children.clear();
}
getBroker().removeChangeListener(this);
- _objectRegistry.close();
+ closeObjectRegistry();
}
@Override
@@ -358,4 +358,19 @@ public class JMXManagement extends Abstr
}
}
}
+
+ private void closeObjectRegistry()
+ {
+ if (_objectRegistry != null)
+ {
+ try
+ {
+ _objectRegistry.close();
+ }
+ finally
+ {
+ _objectRegistry = null;
+ }
+ }
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org