Commit to reduce spurious diffs in the merge

Author: tonyg

test/src/com/rabbitmq/client/test/functional/BrokerTestCase.java

@@ -33,7 +33,6 @@
 import com.rabbitmq.client.Channel;
 import com.rabbitmq.client.Connection;
 import com.rabbitmq.client.ConnectionFactory;
-import com.rabbitmq.tools.Host;
 
 public class BrokerTestCase extends TestCase
 {
@@ -122,4 +121,5 @@ public void closeChannel()
             channel = null;
         }
     }
+
 }

test/src/com/rabbitmq/client/test/functional/Routing.java

@@ -25,8 +25,8 @@
 
 package com.rabbitmq.client.test.functional;
 
-import com.rabbitmq.client.GetResponse;
 import com.rabbitmq.client.AMQP;
+import com.rabbitmq.client.GetResponse;
 
 import java.io.IOException;
 import java.util.List;
@@ -68,7 +68,7 @@ private void check(String routingKey, boolean expectQ1, boolean expectQ2)
     private void checkGet(String queue, boolean messageExpected)
         throws IOException
     {
-        GetResponse  r = channel.basicGet(ticket, queue, true);
+        GetResponse r = channel.basicGet(ticket, queue, true);
         if (messageExpected) {
             assertNotNull(r);
         } else {
@@ -141,6 +141,7 @@ public void testFanoutRouting() throws Exception {
     public void testUnbind() throws Exception {
         AMQP.Queue.DeclareOk ok = channel.queueDeclare(ticket);
         String queue = ok.getQueue();
+
         String routingKey = "quay";
         String x = "amq.direct";
 

test/src/com/rabbitmq/examples/ProducerMain.java

@@ -148,7 +148,7 @@ private void runIt() throws IOException {
 
         String queueName = "test queue";
         _channel.queueDeclare(_ticket, queueName, shouldPersist());
-
+        
         if (shouldCommit()) {
             _channel.txSelect();
         }