Tidy up, and / or reduce the size of the diff with default.

Author: Simon MacMullen

Makefile

@@ -103,4 +103,3 @@ promote-maven-bundle:
 	    -DtargetRepositoryId=releases \
 	    -B \
 	)
-

src/com/rabbitmq/client/ConnectionFactory.java

@@ -373,27 +373,34 @@ public Connection newConnection(Address[] addrs)
         IOException lastException = null;
         for (Address addr : addrs) {
             try {
-              FrameHandler frameHandler = createFrameHandler(addr);
-              AMQConnection conn = new AMQConnection(this,
+                FrameHandler frameHandler = createFrameHandler(addr);
+                AMQConnection conn = new AMQConnection(this,
                                                      frameHandler);
-              conn.start();
-              return conn;
+                conn.start();
+                return conn;
             } catch (IOException e) {
-              lastException = e;
+                lastException = e;
             }
         }
+
         if (lastException == null) {
             throw new IOException("failed to connect");
         } else {
             throw lastException;
         }
     }
 
+    /**
+     * Create a new broker connection
+     * @return an interface to the connection
+     * @throws IOException if it encounters a problem
+     */
     public Connection newConnection() throws IOException {
         return newConnection(new Address[] {
                                  new Address(getHost(), getPort())});
     }
-  
+
+
     @Override public ConnectionFactory clone(){
         try {
             return (ConnectionFactory)super.clone(); 

src/com/rabbitmq/client/DefaultConsumer.java

@@ -74,7 +74,7 @@ public void handleShutdownSignal(String consumerTag, ShutdownSignalException sig
         // no work to do
     }
 
-    /**
+     /**
      * No-op implementation of {@link Consumer#handleRecoverOk}.
      */
     public void handleRecoverOk() {

src/com/rabbitmq/client/impl/AMQConnection.java

@@ -180,7 +180,6 @@ public Map<String, Object> getServerProperties() {
         return _serverProperties;
     }
 
-
     /**
      * Construct a new connection to a broker.
      * @param factory the initialization parameters for a connection
@@ -311,8 +310,6 @@ public void start()
         Method res = _channel0.exnWrappingRpc(new AMQImpl.Connection.Open(_virtualHost,
                                                                           "",
                                                                           true)).getMethod();
-        AMQP.Connection.OpenOk openOk = (AMQP.Connection.OpenOk) res;
-                
         return;
     }
 

test/src/com/rabbitmq/client/test/BrokenFramesTest.java

@@ -82,10 +82,6 @@ public void testNoMethod() throws Exception {
             conn.start();
         } catch (IOException e) {
             UnexpectedFrameError unexpectedFrameError = findUnexpectedFrameError(e);
-            if (unexpectedFrameError==null) {
-              e.printStackTrace();
-              conn.getCloseReason().printStackTrace();
-            }
             assertNotNull(unexpectedFrameError);
             assertEquals(AMQP.FRAME_HEADER, unexpectedFrameError.getReceivedFrame().type);
             assertEquals(AMQP.FRAME_METHOD, unexpectedFrameError.getExpectedFrameType());

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

@@ -117,5 +117,4 @@ public void testNoRedeliveryWithAutoAck()
         throws IOException, InterruptedException {
         verifyNoRedeliveryWithAutoAck(recoverSync);
     }
-  
 }

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

@@ -86,7 +86,7 @@ public static void main(String[] args) {
             final int portNumber = optArg("portNumber", args, 1, AMQP.PROTOCOL.PORT);
             int rateLimit = optArg("rateLimit", args, 2, SEND_RATE);
             int messageCount = optArg("messageCount", args, 3, LATENCY_MESSAGE_COUNT);
-            boolean sendCompletion = optArg("sendCompletion", args, 4, true);
+            boolean sendCompletion = optArg("sendCompletion", args, 4, false);
             int commitEvery = optArg("commitEvery", args, 5, -1);
             boolean sendLatencyInfo = optArg("sendLatencyInfo", args, 6, true);
             final Connection conn = new ConnectionFactory(){{setHost(hostName); setPort(portNumber);}}.newConnection();

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

@@ -423,7 +423,7 @@ public void tryTopics() throws IOException {
         _ch1.queueDeclare(q1, false, false, false, null);
         _ch1.queueDeclare(q2, false, false, false, null);
         _ch1.queueDeclare(q3, false, false, false, null);
-        _ch1.exchangeDeclare(x, "topic", false, true, null);
+        _ch1.exchangeDeclare(x, "topic", false, false, null);
         _ch1.queueBind(q1, x, "test.#");
         _ch1.queueBind(q2, x, "test.test");
         _ch1.queueBind(q3, x, "*.test.#");