From 78158786fef7138d55f8e8984637b3bc3719ffdb Mon Sep 17 00:00:00 2001
From: Keith Wall <kwall@apache.org>
Date: Sun, 27 Oct 2013 12:57:04 +0000
Subject: QPID-5241: [Java Broker] Prevent possibility of NPE during JMX plugin
 shutdown.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1536124 13f79535-47bb-0310-9956-ffa450edef68
---
 .../java/org/apache/qpid/server/jmx/JMXManagement.java  | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

(limited to 'java')

diff --git a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagement.java b/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagement.java
index c8f47c918e..18e9f9f809 100644
--- a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagement.java
+++ b/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagement.java
@@ -230,7 +230,7 @@ public class JMXManagement extends AbstractPluginAdapter implements Configuratio
             _children.clear();
         }
         getBroker().removeChangeListener(this);
-        _objectRegistry.close();
+        closeObjectRegistry();
     }
 
     @Override
@@ -358,4 +358,19 @@ public class JMXManagement extends AbstractPluginAdapter implements Configuratio
             }
         }
     }
+
+    private void closeObjectRegistry()
+    {
+        if (_objectRegistry != null)
+        {
+            try
+            {
+                _objectRegistry.close();
+            }
+            finally
+            {
+                _objectRegistry = null;
+            }
+        }
+    }
 }
-- 
cgit v1.2.1