QPID-809 Updated logging and some whitespace changes.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@630872 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 12 insertions, 10 deletions

diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java b/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java
index b2797138c2..89a56b9a3c 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -26,6 +26,7 @@ import java.util.UUID;
 import org.apache.log4j.Logger;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.configuration.Configured;
+
 import org.apache.qpid.framing.*;
 import org.apache.qpid.protocol.AMQConstant;
 import org.apache.qpid.server.configuration.Configurator;
@@ -45,7 +46,7 @@ import org.apache.commons.configuration.Configuration;
 
 public class QueueDeclareHandler implements StateAwareMethodListener<QueueDeclareBody>
 {
-    private static final Logger _log = Logger.getLogger(QueueDeclareHandler.class);
+    private static final Logger _logger = Logger.getLogger(QueueDeclareHandler.class);
 
     private static final QueueDeclareHandler _instance = new QueueDeclareHandler();
 
@@ -109,7 +110,7 @@ public class QueueDeclareHandler implements StateAwareMethodListener<QueueDeclar
                 }
                 else
                 {
-                    queue = createQueue(queueName,body, virtualHost, session);
+                    queue = createQueue(queueName, body, virtualHost, session);
                     if (queue.isDurable() && !queue.isAutoDelete())
                     {
                         store.createQueue(queue);
@@ -124,7 +125,7 @@ public class QueueDeclareHandler implements StateAwareMethodListener<QueueDeclar
                                                                  defaultExchange, queue, queueName);
 
                         queue.bind(queueName, null, defaultExchange);
-                        _log.info("Queue " + queueName + " bound to default exchange(" + defaultExchange.getName() + ")");
+                        _logger.info("Queue " + queueName + " bound to default exchange(" + defaultExchange.getName() + ")");
                     }
                 }
             }
@@ -156,7 +157,7 @@ public class QueueDeclareHandler implements StateAwareMethodListener<QueueDeclar
                                                             queue.getConsumerCount());
             session.writeFrame(responseBody.generateFrame(channelId));
 
-            _log.info("Queue " + queueName + " declared successfully");
+            _logger.info("Queue " + queueName + " declared successfully");
         }
     }
 
diff --git a/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java b/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java
index e4e0b5b1b8..e0fcaa208d 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -59,6 +59,7 @@ public class ConfigurationFileApplicationRegistry extends ApplicationRegistry
     private VirtualHostRegistry _virtualHostRegistry;
 
 
+    //fixme Why is this not used.
     private final Map<String, VirtualHost> _virtualHosts = new ConcurrentHashMap<String, VirtualHost>();
 
     private PluginManager _pluginManager;
@@ -121,7 +122,7 @@ public class ConfigurationFileApplicationRegistry extends ApplicationRegistry
         _managedObjectRegistry.start();
 
         _pluginManager = new PluginManager(_configuration.getString("plugin-directory"));
-        
+
         initialiseVirtualHosts();
 
     }
@@ -178,7 +179,7 @@ public class ConfigurationFileApplicationRegistry extends ApplicationRegistry
     {
         return getConfiguration().getList("virtualhosts.virtualhost.name");
     }
-    
+
     public PluginManager getPluginManager()
     {
         return _pluginManager;