From 88782570f5e820c449dd3c5c47cc417f0751226d Mon Sep 17 00:00:00 2001 From: Martin Ritchie Date: Thu, 3 Jun 2010 21:29:48 +0000 Subject: QPID-1447 : Ensure we only attempt to load plugins that are configured and so will be created. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@951168 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/qpid/server/virtualhost/VirtualHostImpl.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'qpid/java') diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java index f7ad934a57..5ea4ade559 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java @@ -303,10 +303,14 @@ public class VirtualHostImpl implements VirtualHost { VirtualHostPlugin plugin = plugins.get(pluginName).newInstance(this); - _houseKeepingTasks.scheduleAtFixedRate(plugin, plugin.getDelay() / 2, - plugin.getDelay(), plugin.getTimeUnit()); + // If we had configuration for the plugin the schedule it. + if (plugin != null) + { + _houseKeepingTasks.scheduleAtFixedRate(plugin, plugin.getDelay() / 2, + plugin.getDelay(), plugin.getTimeUnit()); - _logger.info("Loaded VirtualHostPlugin:" + plugin); + _logger.info("Loaded VirtualHostPlugin:" + plugin); + } } catch (RuntimeException e) { -- cgit v1.2.1