svn commit: r630865 - in /incubator/qpid/branches/M2.1/java: broker/src/main/java/org/apache/qpid/server/handler/ broker/src/main/java/org/apache/qpid/server/security/auth/manager/ client/src/main/java/org/apache/qpid/client/

[ritchiem]

Author: ritchiem
Date: Mon Feb 25 06:50:04 2008
New Revision: 630865

URL: http://svn.apache.org/viewvc?rev=630865&view=rev
Log:
QPID-809 Updated logging and removed an unnecessary printStackTrace().

Modified:
    
incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/handler/BasicPublishMethodHandler.java
    
incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
    
incubator/qpid/branches/M2.1/java/client/src/main/java/org/apache/qpid/client/AMQSession.java

Modified: 
incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/handler/BasicPublishMethodHandler.java
URL: 
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/handler/BasicPublishMethodHandler.java?rev=630865&r1=630864&r2=630865&view=diff
==============================================================================
--- 
incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/handler/BasicPublishMethodHandler.java
 (original)
+++ 
incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/handler/BasicPublishMethodHandler.java
 Mon Feb 25 06:50:04 2008
@@ -35,9 +35,9 @@
 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 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();

Modified: 
incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
URL: 
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java?rev=630865&r1=630864&r2=630865&view=diff
==============================================================================
--- 
incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
 (original)
+++ 
incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
 Mon Feb 25 06:50:04 2008
@@ -82,14 +82,6 @@
             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;
             }

Modified: 
incubator/qpid/branches/M2.1/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
URL: 
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/client/src/main/java/org/apache/qpid/client/AMQSession.java?rev=630865&r1=630864&r2=630865&view=diff
==============================================================================
--- 
incubator/qpid/branches/M2.1/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
 (original)
+++ 
incubator/qpid/branches/M2.1/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
 Mon Feb 25 06:50:04 2008
@@ -615,7 +615,6 @@
                     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.
@@ -1758,11 +1757,6 @@
                         catch (AMQException e)
                         {
                             JMSException ex = new JMSException("Error 
registering consumer: " + e);
-
-                            if (_logger.isDebugEnabled())
-                            {
-                                e.printStackTrace();
-                            }
 
                             ex.setLinkedException(e);
                             throw ex;