QPID-809 Updated logging and removed an unnecessary printStackTrace().

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

3 files changed, 4 insertions, 21 deletions

diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/BasicPublishMethodHandler.java b/java/broker/src/main/java/org/apache/qpid/server/handler/BasicPublishMethodHandler.java
index b0ac6c81f6..0f99a21ee5 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/handler/BasicPublishMethodHandler.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/handler/BasicPublishMethodHandler.java
@@ -35,9 +35,9 @@ import org.apache.qpid.server.state.AMQStateManager;
 import org.apache.qpid.server.state.StateAwareMethodListener;
 import org.apache.qpid.server.virtualhost.VirtualHost;
 
-public class BasicPublishMethodHandler  implements StateAwareMethodListener<BasicPublishBody>
+public class BasicPublishMethodHandler implements StateAwareMethodListener<BasicPublishBody>
 {
-    private static final Logger _log = Logger.getLogger(BasicPublishMethodHandler.class);
+    private static final Logger _logger = Logger.getLogger(BasicPublishMethodHandler.class);
 
     private static final BasicPublishMethodHandler _instance = new BasicPublishMethodHandler();
 
@@ -54,12 +54,9 @@ public class BasicPublishMethodHandler  implements StateAwareMethodListener<Basi
     public void methodReceived(AMQStateManager stateManager, BasicPublishBody body, int channelId) throws AMQException
     {
         AMQProtocolSession session = stateManager.getProtocolSession();
-
-
-
-        if (_log.isDebugEnabled())
+        if (_logger.isDebugEnabled())
         {
-            _log.debug("Publish received on channel " + channelId);
+            _logger.debug("Publish received on channel " + channelId);
         }
 
         AMQShortString exchange = body.getExchange();
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java b/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
index ce5e0cd748..f589140e8e 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
@@ -82,14 +82,6 @@ public class PrincipalDatabaseAuthenticationManager implements AuthenticationMan
             if (databaseName == null)
             {
 
-                if (hostConfig instanceof SubsetConfiguration)
-                {
-                    _logger.warn("No authentication specified for '" + ((SubsetConfiguration) hostConfig).getPrefix() + "'. Using Default authentication manager");
-                }
-                else
-                {
-                    _logger.warn("No authentication specified. Using Default authentication manager");
-                }
                 _default = ApplicationRegistry.getInstance().getAuthenticationManager();
                 return;
             }
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQSession.java b/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
index 73f3ccbee4..2ecc0515a5 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
+++ b/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
@@ -615,7 +615,6 @@ public class AMQSession extends Closeable implements Session, QueueSession, Topi
                     final AMQFrame frame = body.generateFrame(getChannelId());
 
                     getProtocolHandler().syncWrite(frame, ChannelCloseOkBody.class, timeout);
-                     
 
                         // When control resumes at this point, a reply will have been received that
                         // indicates the broker has closed the channel successfully.
@@ -1759,11 +1758,6 @@ public class AMQSession extends Closeable implements Session, QueueSession, Topi
                         {
                             JMSException ex = new JMSException("Error registering consumer: " + e);
 
-                            if (_logger.isDebugEnabled())
-                            {
-                                e.printStackTrace();
-                            }
-
                             ex.setLinkedException(e);
                             throw ex;
                         }