diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2010-05-20 15:20:04 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2010-05-20 15:20:04 +0000 |
| commit | 271bb681b7efc63ae12ae409f21e95179496c042 (patch) | |
| tree | 8817743f25f804add7be221ab30941f39b0567a8 /qpid/java/broker | |
| parent | 8cc08cb2ccf109a76ab695dcf701c9410960860e (diff) | |
| download | qpid-python-271bb681b7efc63ae12ae409f21e95179496c042.tar.gz | |
QPID-1447 : Modified VirtualHostHouseKeepingPlugin to return a TimeUnit and force plugin to perform validation. Potentially could be refactored to allow all VHHKPlugins to process TimeUnits in a consistent way.
Add Config validation and UnitTest for SlowConsumerDetctionConfiguration.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@946669 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker')
2 files changed, 4 insertions, 19 deletions
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 4a2f796d2b..2542e1e94d 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 @@ -343,26 +343,9 @@ public class VirtualHostImpl implements Accessable, VirtualHost VirtualHostHouseKeepingPlugin plugin = plugins.get(pluginName).newInstance(this); - TimeUnit units = TimeUnit.MILLISECONDS; - - if (plugin.getTimeUnit() != null) - { - try - { - units = TimeUnit.valueOf(plugin.getTimeUnit()); - } - catch (IllegalArgumentException iae) - { - _logger.warn("Plugin:" + pluginName + - " provided an illegal TimeUnit value:" - + plugin.getTimeUnit()); - // Warn and use default of millseconds - // Should not occur in a well behaved plugin - } - } _houseKeepingTasks.scheduleAtFixedRate(plugin, plugin.getDelay() / 2, - plugin.getDelay(), units); + plugin.getDelay(), plugin.getTimeUnit()); _logger.info("Loaded VirtualHostPlugin:" + plugin); } diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/VirtualHostHouseKeepingPlugin.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/VirtualHostHouseKeepingPlugin.java index e76844fa3a..d2fd4daaa5 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/VirtualHostHouseKeepingPlugin.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/VirtualHostHouseKeepingPlugin.java @@ -23,6 +23,8 @@ package org.apache.qpid.server.virtualhost.plugins; import org.apache.qpid.server.virtualhost.HouseKeepingTask; import org.apache.qpid.server.virtualhost.VirtualHost; +import java.util.concurrent.TimeUnit; + public abstract class VirtualHostHouseKeepingPlugin extends HouseKeepingTask { public VirtualHostHouseKeepingPlugin(VirtualHost vhost) @@ -44,6 +46,6 @@ public abstract class VirtualHostHouseKeepingPlugin extends HouseKeepingTask * * @see java.util.concurrent.TimeUnit for valid value. */ - public abstract String getTimeUnit(); + public abstract TimeUnit getTimeUnit(); } |