diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2010-05-20 15:18:14 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2010-05-20 15:18:14 +0000 |
| commit | 4f641bd0c0deb1eda0524d8b73bc295b160817c4 (patch) | |
| tree | 431a5b621cf4239cedd9748febf7a814d8fae3ac /java/broker-plugins/experimental/slowconsumerdetection/src/main | |
| parent | f708d8b6f4e703802313ef536e8f77547bd9d737 (diff) | |
| download | qpid-python-4f641bd0c0deb1eda0524d8b73bc295b160817c4.tar.gz | |
QPID-1447 : Full test the TopicDeletePolicy, udpate MockAMQQueue and InternalTestProtocolSession to allow:
- Queue- Setting of AutoDelete
- ProtocolSession - Closing
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@946665 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/broker-plugins/experimental/slowconsumerdetection/src/main')
2 files changed, 10 insertions, 4 deletions
diff --git a/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionPolicyConfiguration.java b/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionPolicyConfiguration.java index a413da387b..482168930b 100644 --- a/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionPolicyConfiguration.java +++ b/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionPolicyConfiguration.java @@ -25,8 +25,6 @@ import org.apache.commons.configuration.ConfigurationException; import org.apache.qpid.server.configuration.plugins.ConfigurationPlugin; import org.apache.qpid.server.configuration.plugins.ConfigurationPluginFactory; -import java.util.List; - public class SlowConsumerDetectionPolicyConfiguration extends ConfigurationPlugin { @@ -61,4 +59,14 @@ public class SlowConsumerDetectionPolicyConfiguration extends ConfigurationPlugi return _configuration.getString("name"); } + public void setConfiguration(String path, Configuration configuration) throws ConfigurationException + { + super.setConfiguration(path,configuration); + + if (getPolicyName() == null) + { + throw new ConfigurationException("No Slow consumer policy defined."); + } + } + } diff --git a/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetection.java b/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetection.java index e69925f2b1..afd3059a77 100644 --- a/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetection.java +++ b/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetection.java @@ -105,8 +105,6 @@ class SlowConsumerDetection extends VirtualHostHouseKeepingPlugin { if (config != null) { - - if ((config.getMessageCount() != 0 && q.getMessageCount() >= config.getMessageCount()) || (config.getDepth() != 0 && q.getQueueDepth() >= config.getDepth()) || (config.getMessageAge() != 0 && q.getOldestMessageArrivalTime() >= config.getMessageAge())) |