svn commit: r1492250 - /activemq/trunk/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java

[ta...@apache.org]

Author: tabish
Date: Wed Jun 12 15:41:56 2013
New Revision: 1492250

URL: http://svn.apache.org/r1492250
Log:
Add some more asserts to the test and clean up logging in the protocol converter, replace all the System.out.println calls

Modified:
    activemq/trunk/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java

Modified: activemq/trunk/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java?rev=1492250&r1=1492249&r2=1492250&view=diff
==============================================================================
--- activemq/trunk/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java (original)
+++ activemq/trunk/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java Wed Jun 12 15:41:56 2013
@@ -130,12 +130,18 @@ class AmqpProtocolConverter {
             this.protonTransport.setProtocolTracer(new ProtocolTracer() {
                 @Override
                 public void receivedFrame(TransportFrame transportFrame) {
-                    System.out.println(String.format("%s | RECV: %s", amqpTransport.getRemoteAddress(), transportFrame.getBody()));
+                    if (LOG.isDebugEnabled()) {
+                        LOG.debug(String.format("%s | RECV: %s",
+                            amqpTransport.getRemoteAddress(), transportFrame.getBody()));
+                    }
                 }
 
                 @Override
                 public void sentFrame(TransportFrame transportFrame) {
-                    System.out.println(String.format("%s | SENT: %s", amqpTransport.getRemoteAddress(), transportFrame.getBody()));
+                    if (LOG.isDebugEnabled()) {
+                        LOG.debug(String.format("%s | SENT: %s",
+                            amqpTransport.getRemoteAddress(), transportFrame.getBody()));
+                    }
                 }
             });
         }
@@ -418,7 +424,9 @@ class AmqpProtocolConverter {
     private void onSessionClose(Session session) {
         AmqpSessionContext sessionContext = (AmqpSessionContext) session.getContext();
         if (sessionContext != null) {
-            System.out.println(sessionContext.sessionId);
+            if (LOG.isTraceEnabled()) {
+                LOG.trace("Session {} closed", sessionContext.sessionId);
+            }
             sendToActiveMQ(new RemoveInfo(sessionContext.sessionId), null);
             session.setContext(null);
         }
@@ -464,7 +472,7 @@ class AmqpProtocolConverter {
         public void onDelivery(Delivery delivery) throws Exception {
             Receiver receiver = ((Receiver) delivery.getLink());
             if (!delivery.isReadable()) {
-                System.out.println("it was not readable!");
+                LOG.debug("Delivery was not readable!");
                 return;
             }
 
@@ -588,7 +596,7 @@ class AmqpProtocolConverter {
             }
 
             Object action = ((AmqpValue) msg.getBody()).getValue();
-            System.out.println("COORDINATOR received: " + action + ", [" + buffer + "]");
+            LOG.debug("COORDINATOR received: " + action + ", [" + buffer + "]");
             if (action instanceof Declare) {
                 Declare declare = (Declare) action;
                 if (declare.getGlobalId() != null) {
@@ -598,7 +606,9 @@ class AmqpProtocolConverter {
                 long txid = nextTransactionId++;
                 TransactionInfo txinfo = new TransactionInfo(connectionId, new LocalTransactionId(connectionId, txid), TransactionInfo.BEGIN);
                 sendToActiveMQ(txinfo, null);
-                System.out.println("started transaction " + txid);
+                if (LOG.isTraceEnabled()) {
+                    LOG.trace("started transaction " + txid);
+                }
 
                 Declared declared = new Declared();
                 declared.setTxnId(new Binary(toBytes(txid)));
@@ -610,10 +620,14 @@ class AmqpProtocolConverter {
 
                 byte operation;
                 if (discharge.getFail()) {
-                    System.out.println("rollback transaction " + txid);
+                    if (LOG.isTraceEnabled()) {
+                        LOG.trace("rollback transaction " + txid);
+                    }
                     operation = TransactionInfo.ROLLBACK;
                 } else {
-                    System.out.println("commit transaction " + txid);
+                    if (LOG.isTraceEnabled()) {
+                        LOG.trace("commit transaction " + txid);
+                    }
                     operation = TransactionInfo.COMMIT_ONE_PHASE;
                 }
                 TransactionInfo txinfo = new TransactionInfo(connectionId, new LocalTransactionId(connectionId, txid), operation);