QPID-2585 : Prevent NPE if plugins are not enabled but requested

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@947174 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 6 insertions, 0 deletions

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java
index c1eff5f8db..cba8dda425 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java
@@ -245,6 +245,12 @@ public class PluginManager implements Closeable
 
     public <P extends PluginFactory> Map<String, P> getPlugins(Class<P> plugin)
     {
+        // If plugins are not configured then return an empty set
+        if (_activator == null)
+        {
+            return new HashMap<String, P>();
+        }
+
         ServiceTracker tracker = new ServiceTracker(_activator.getContext(), plugin.getName(), null);
         tracker.open();