NO-JIRA : AMQP-1-0 sandbox updates - merge from trunkrg-amqp-1-0-sandbox

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/rg-amqp-1-0-sandbox@1299257 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 14 insertions, 15 deletions

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/SlowConsumerDetection.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/SlowConsumerDetection.java
index 248b3b2143..2c6705bb3b 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/SlowConsumerDetection.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/SlowConsumerDetection.java
@@ -19,21 +19,20 @@
  */
 package org.apache.qpid.server.virtualhost.plugins;
 
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
 import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.server.configuration.plugins.ConfigurationPlugin;
 import org.apache.qpid.server.configuration.plugins.SlowConsumerDetectionConfiguration;
 import org.apache.qpid.server.configuration.plugins.SlowConsumerDetectionQueueConfiguration;
-import org.apache.qpid.server.configuration.plugins.ConfigurationPlugin;
 import org.apache.qpid.server.exchange.ExchangeRegistry;
 import org.apache.qpid.server.logging.actors.CurrentActor;
-import org.apache.qpid.server.plugins.Plugin;
 import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.server.virtualhost.VirtualHost;
 import org.apache.qpid.server.virtualhost.plugins.logging.SlowConsumerDetectionMessages;
 import org.apache.qpid.slowconsumerdetection.policies.SlowConsumerPolicyPlugin;
 
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
 public class SlowConsumerDetection extends VirtualHostHouseKeepingPlugin
 {
     private SlowConsumerDetectionConfiguration _config;
@@ -61,7 +60,7 @@ public class SlowConsumerDetection extends VirtualHostHouseKeepingPlugin
      * virtual host to record all the configured queues in a cache for processing by the housekeeping
      * thread.
      * 
-     * @see Plugin#configure(ConfigurationPlugin)
+     * @see org.apache.qpid.server.plugins.Plugin#configure(ConfigurationPlugin)
      */
     public void configure(ConfigurationPlugin config)
     {        
@@ -98,7 +97,7 @@ public class SlowConsumerDetection extends VirtualHostHouseKeepingPlugin
                     if (policy == null)
                     {
                         // We would only expect to see this during shutdown
-                        _logger.warn("No slow consumer policy for queue " + q.getName());
+                        getLogger().warn("No slow consumer policy for queue " + q.getName());
                     }
                     else
                     {
@@ -110,7 +109,7 @@ public class SlowConsumerDetection extends VirtualHostHouseKeepingPlugin
             catch (Exception e)
             {
                 // Don't throw exceptions as this will stop the house keeping task from running.
-                _logger.error("Exception in SlowConsumersDetection for queue: " + q.getName(), e);
+                getLogger().error("Exception in SlowConsumersDetection for queue: " + q.getName(), e);
             }
         }
 
@@ -139,9 +138,9 @@ public class SlowConsumerDetection extends VirtualHostHouseKeepingPlugin
     {
         if (config != null)
         {
-            if (_logger.isInfoEnabled())
+            if (getLogger().isInfoEnabled())
             {
-                _logger.info("Retrieved Queue(" + q.getName() + ") Config:" + config);
+                getLogger().info("Retrieved Queue(" + q.getName() + ") Config:" + config);
             }
 
             int count = q.getMessageCount();
@@ -157,12 +156,12 @@ public class SlowConsumerDetection extends VirtualHostHouseKeepingPlugin
                  ((count > 0) && q.getOldestMessageArrivalTime() >= config.getMessageAge())))
             {
                 
-                if (_logger.isDebugEnabled())
+                if (getLogger().isDebugEnabled())
                 {
-                    _logger.debug("Detected Slow Consumer on Queue(" + q.getName() + ")");
-                    _logger.debug("Queue Count:" + q.getMessageCount() + ":" + config.getMessageCount());
-                    _logger.debug("Queue Depth:" + q.getQueueDepth() + ":" + config.getDepth());
-                    _logger.debug("Queue Arrival:" + q.getOldestMessageArrivalTime() + ":" + config.getMessageAge());
+                    getLogger().debug("Detected Slow Consumer on Queue(" + q.getName() + ")");
+                    getLogger().debug("Queue Count:" + q.getMessageCount() + ":" + config.getMessageCount());
+                    getLogger().debug("Queue Depth:" + q.getQueueDepth() + ":" + config.getDepth());
+                    getLogger().debug("Queue Arrival:" + q.getOldestMessageArrivalTime() + ":" + config.getMessageAge());
                 }
 
                 return true;