diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2010-05-21 21:08:23 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2010-05-21 21:08:23 +0000 |
| commit | 3e882a6fdc6852f0023f2f8547413c252e270a03 (patch) | |
| tree | 9391ead1a8b4f93eb231c1029562faea676b23cd /qpid/java/broker/src/main | |
| parent | 5afdc67935d07852c7c166741401ec4a77604d9b (diff) | |
| download | qpid-python-3e882a6fdc6852f0023f2f8547413c252e270a03.tar.gz | |
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
Diffstat (limited to 'qpid/java/broker/src/main')
| -rw-r--r-- | qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java | 6 |
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(); |