diff options
Diffstat (limited to 'java/broker-plugins/experimental/slowconsumerdetection/src/main')
3 files changed, 8 insertions, 12 deletions
diff --git a/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicy.java b/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicy.java index 36892cdcb0..04abaacc74 100644 --- a/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicy.java +++ b/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicy.java @@ -20,6 +20,7 @@ */ package org.apache.qpid.server.virtualhost.plugin.policies; +import org.apache.commons.configuration.ConfigurationException; import org.apache.log4j.Logger; import org.apache.qpid.AMQException; import org.apache.qpid.protocol.AMQConstant; @@ -39,19 +40,12 @@ public class TopicDeletePolicy implements SlowConsumerPolicyPlugin public static class TopicDeletePolicyFactory implements SlowConsumerPolicyPluginFactory { - public SlowConsumerPolicyPlugin newInstance(SlowConsumerDetectionPolicyConfiguration configuration) + public SlowConsumerPolicyPlugin newInstance(SlowConsumerDetectionPolicyConfiguration configuration) throws ConfigurationException { TopicDeletePolicyConfiguration config = configuration.getConfiguration(TopicDeletePolicyConfiguration.class); - - if (config != null) - { - return new TopicDeletePolicy(config); - } - else - { - return null; - } + + return new TopicDeletePolicy(config); } public String getPluginName() diff --git a/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyConfiguration.java b/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyConfiguration.java index 69996b026f..30c1b05b4e 100644 --- a/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyConfiguration.java +++ b/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyConfiguration.java @@ -56,7 +56,8 @@ public class TopicDeletePolicyConfiguration extends ConfigurationPlugin public boolean deletePersistent() { - return _configuration.containsKey("delete-persistent"); + // If we don't have configuration then we don't deletePersistent Queues + return (_configuration != null && _configuration.containsKey("delete-persistent")); } } diff --git a/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/slowconsumerdetection/policies/SlowConsumerPolicyPluginFactory.java b/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/slowconsumerdetection/policies/SlowConsumerPolicyPluginFactory.java index 2bd7b67e91..c142139009 100644 --- a/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/slowconsumerdetection/policies/SlowConsumerPolicyPluginFactory.java +++ b/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/slowconsumerdetection/policies/SlowConsumerPolicyPluginFactory.java @@ -20,11 +20,12 @@ */ package org.apache.qpid.slowconsumerdetection.policies; +import org.apache.commons.configuration.ConfigurationException; import org.apache.qpid.server.configuration.plugin.SlowConsumerDetectionPolicyConfiguration; import org.apache.qpid.server.plugins.PluginFactory; public interface SlowConsumerPolicyPluginFactory extends PluginFactory { - public SlowConsumerPolicyPlugin newInstance(SlowConsumerDetectionPolicyConfiguration configuration); + public SlowConsumerPolicyPlugin newInstance(SlowConsumerDetectionPolicyConfiguration configuration) throws ConfigurationException; } |