/*
 * The MIT License
 *
 * Copyright (c) 2009-2010, Sun Microsystems, Inc., CloudBees, Inc.
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
 * in the Software without restriction, including without limitation the rights
 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 * copies of the Software, and to permit persons to whom the Software is
 * furnished to do so, subject to the following conditions:
 *
 * The above copyright notice and this permission notice shall be included in
 * all copies or substantial portions of the Software.
 *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 * THE SOFTWARE.
 */
package hudson.util;
 
import java.io.IOException;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.Socket;
import java.net.UnknownHostException;

import org.apache.commons.httpclient.ConnectTimeoutException;
import org.apache.commons.httpclient.params.HttpConnectionParams; 
import org.apache.commons.httpclient.protocol.ProtocolSocketFactory;

/**
 * A SecureProtocolSocketFactory that creates sockets without binding to a specific interface.
 * Based on org.apache.commons.httpclient.protocol.DefaultProtocolSocketFactory
 * 
 */
public class NoClientBindProtocolSocketFactory implements ProtocolSocketFactory {
 
    public NoClientBindProtocolSocketFactory() {
    }
 
    public Socket createSocket(String host, 
                               int port,
                               InetAddress localAddress,
                               int localPort) throws IOException, UnknownHostException {
        // ignore the local address/port for binding
        return createSocket(host, port);
    }
 
    /**
     * Attempts to get a new socket connection to the given host within the given time limit.
     * <p>
     * This method employs several techniques to circumvent the limitations of older JREs that 
     * do not support connect timeout. When running in JRE 1.4 or above reflection is used to 
     * call Socket#connect(SocketAddress endpoint, int timeout) method. When executing in older 
     * JREs a controller thread is executed. The controller thread attempts to create a new socket
     * within the given limit of time. If socket constructor does not return until the timeout 
     * expires, the controller terminates and throws an {@link ConnectTimeoutException}
     * </p>
     *  
     * @param host the host name/IP
     * @param port the port on the host
     * @param localAddress the local host name/IP to bind the socket to, ignored
     * @param localPort the port on the local machine, ignored
     * @param params {@link HttpConnectionParams Http connection parameters}
     * 
     * @return Socket a new socket
     * 
     * @throws IOException if an I/O error occurs while creating the socket
     * @throws UnknownHostException if the IP address of the host cannot be
     * determined
     * @throws ConnectTimeoutException if socket cannot be connected within the
     *  given time limit
     * 
     * @since 3.0
     */
    public Socket createSocket(String host, int port, InetAddress localAddress,
            int localPort, HttpConnectionParams params) throws IOException,
            UnknownHostException, ConnectTimeoutException {
        if (params == null) {
            throw new IllegalArgumentException("Parameters may not be null");
        }
        int timeout = params.getConnectionTimeout();
        if (timeout == 0) {
            // ignore the local address/port for binding
            return createSocket(host, port);
        } else {
            Socket s=new Socket();
            s.connect(new InetSocketAddress(host,port),timeout);
            return s;
        }
    }
    
    /**
     * @see ProtocolSocketFactory#createSocket(java.lang.String,int)
     */
    public Socket createSocket(String host, int port) throws IOException,
            UnknownHostException,IOException {
        Socket socket;
        try {
            socket = new Socket(host, port);
        }        
        catch (IOException e) {
            throw e;
        }
        return socket;
    }
    
    /**
     * All instances are the same.
     */
    public boolean equals(Object obj) {
        return ((obj != null) && obj.getClass().equals(NoClientBindProtocolSocketFactory.class));
    }

    /**
     * All instances have the same hash code.
     */
    public int hashCode() {
        return NoClientBindProtocolSocketFactory.class.hashCode();
    }
}

@@ -4461,184 +4461,37 @@
     
-Socket socket;%0A        try %7B%0A            socket = new Socket(host, port);%0A        %7D        %0A        catch (IOException e) %7B%0A            throw e;%0A        %7D%0A        return socket
+return new Socket(host, port)
 ;%0A  

Remove unnecessary try/catch statement