← Back to branch summary

~ubuntu-branches/ubuntu/vivid/httpcomponents-core/vivid

« back to all changes in this revision

Viewing changes to httpcore/src/main/java/org/apache/http/impl/pool/BasicConnFactory.java

  • Committer: Package Import Robot
  • Author(s): Emmanuel Bourg
  • Date: 2014-10-25 23:01:10 UTC
  • mfrom: (1.2.5)
  • Revision ID: package-import@ubuntu.com-20141025230110-lhr341pbqk6l2loc
Tags: 4.3.3-1
* New upstream release
* Ignore the apache-rat-plugin
* Standards-Version updated to 3.9.6 (no changes)

Show diffs side-by-side

added added

removed removed

Lines of Context:
httpcore/src/main/java/org/apache/http/impl/pool/BasicConnFactory.java
164
164
            }
165
165
        }
166
166
        socket.setSoTimeout(this.sconfig.getSoTimeout());
167
 
        socket.connect(new InetSocketAddress(hostname, port), this.connectTimeout);
168
167
        socket.setTcpNoDelay(this.sconfig.isTcpNoDelay());
169
168
        final int linger = this.sconfig.getSoLinger();
170
169
        if (linger >= 0) {
171
170
            socket.setSoLinger(linger > 0, linger);
172
171
        }
173
172
        socket.setKeepAlive(this.sconfig.isSoKeepAlive());
 
173
        socket.connect(new InetSocketAddress(hostname, port), this.connectTimeout);
174
174
        return this.connFactory.createConnection(socket);
175
175
    }
176
176