You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by ma...@apache.org on 2009/08/28 23:50:59 UTC
svn commit: r809040 - in /db/derby/code/branches/10.4: ./
java/engine/org/apache/derby/impl/services/jmx/JMXManagementService.java
Author: mamta
Date: Fri Aug 28 21:50:59 2009
New Revision: 809040
URL: http://svn.apache.org/viewvc?rev=809040&view=rev
Log:
DERBY-4306
Merge changes into 10.4 from the trunk.
Modified:
db/derby/code/branches/10.4/ (props changed)
db/derby/code/branches/10.4/java/engine/org/apache/derby/impl/services/jmx/JMXManagementService.java
Propchange: db/derby/code/branches/10.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 28 21:50:59 2009
@@ -1 +1 @@
-/db/derby/code/trunk:788436,793588,805696
+/db/derby/code/trunk:788436,793588,797147,805696
Modified: db/derby/code/branches/10.4/java/engine/org/apache/derby/impl/services/jmx/JMXManagementService.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/java/engine/org/apache/derby/impl/services/jmx/JMXManagementService.java?rev=809040&r1=809039&r2=809040&view=diff
==============================================================================
--- db/derby/code/branches/10.4/java/engine/org/apache/derby/impl/services/jmx/JMXManagementService.java (original)
+++ db/derby/code/branches/10.4/java/engine/org/apache/derby/impl/services/jmx/JMXManagementService.java Fri Aug 28 21:50:59 2009
@@ -285,6 +285,10 @@
*/
private synchronized void unregisterMBean(final ObjectName mbeanName)
{
+ //Has this service been shut down?
+ if (registeredMbeans == null)
+ return;
+
if (registeredMbeans.remove(mbeanName) == null)
return;