From be2eb0f1a11aea2b190229dea3f25bf6b48d746c Mon Sep 17 00:00:00 2001
From: Martin Ritchie <ritchiem@apache.org>
Date: Fri, 21 May 2010 21:08:23 +0000
Subject: QPID-2585 : Prevent NPE if plugins are not enabled but requested

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@947174 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/main/java/org/apache/qpid/server/plugins/PluginManager.java | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'java/broker/src')

diff --git a/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java b/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java
index c1eff5f8db..cba8dda425 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java
+++ b/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();
 
-- 
cgit v1.2.1