Clean up sockets and/or connections if IOException occurs (late) in connection logic.

Author: Steve Powell

src/com/rabbitmq/client/ConnectionFactory.java

@@ -438,10 +438,22 @@ protected FrameHandler createFrameHandler(Address addr)
 
         String hostName = addr.getHost();
         int portNumber = portOrDefault(addr.getPort());
-        Socket socket = factory.createSocket();
-        configureSocket(socket);
-        socket.connect(new InetSocketAddress(hostName, portNumber), connectionTimeout);
-        return createFrameHandler(socket);
+        Socket socket = null;
+        try {
+            socket = factory.createSocket();
+            configureSocket(socket);
+            socket.connect(new InetSocketAddress(hostName, portNumber),
+                    connectionTimeout);
+            return createFrameHandler(socket);
+        } catch (IOException ioe) {
+            quietTrySocketClose(socket);
+            throw ioe;
+        }
+    }
+
+    private static void quietTrySocketClose(Socket socket) {
+        if (socket != null)
+            try { socket.close(); } catch (Exception _) {/*ignore exceptions*/}
     }
 
     protected FrameHandler createFrameHandler(Socket sock)
@@ -488,9 +500,10 @@ public Connection newConnection(ExecutorService executor, Address[] addrs)
     {
         IOException lastException = null;
         for (Address addr : addrs) {
+            AMQConnection conn = null;
             try {
                 FrameHandler frameHandler = createFrameHandler(addr);
-                AMQConnection conn =
+                conn =
                     new AMQConnection(username,
                                       password,
                                       frameHandler,
@@ -504,6 +517,7 @@ public Connection newConnection(ExecutorService executor, Address[] addrs)
                 conn.start();
                 return conn;
             } catch (IOException e) {
+                quietTryConnectionClose(conn);
                 lastException = e;
             }
         }
@@ -512,6 +526,12 @@ public Connection newConnection(ExecutorService executor, Address[] addrs)
                                       : new IOException("failed to connect");
     }
 
+    private static void quietTryConnectionClose(AMQConnection connection)
+    {
+        if (connection != null)
+            try { connection.close(); } catch(Exception _) {/*ignore exceptions*/}
+    }
+
     /**
      * Create a new broker connection
      * @return an interface to the connection