Skip to content

Commit ff20dd9

Browse files
author
Stephane Landelle
committed
rename handshakeTimeoutInMillis into handshakeTimeout
1 parent e3a079a commit ff20dd9

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/main/java/com/ning/http/client/providers/netty/NettyAsyncHttpProviderConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ public void setNettyTimer(Timer nettyTimer) {
193193
this.nettyTimer = nettyTimer;
194194
}
195195

196-
public long getHandshakeTimeoutInMillis() {
196+
public long getHandshakeTimeout() {
197197
return handshakeTimeoutInMillis;
198198
}
199199

src/main/java/com/ning/http/client/providers/netty/channel/ChannelManager.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public class ChannelManager {
8686
private final boolean maxConnectionsPerHostEnabled;
8787
private final ConcurrentHashMap<String, Semaphore> freeChannelsPerHost;
8888
private final ConcurrentHashMap<Integer, String> channelId2KeyPool;
89-
private final long handshakeTimeoutInMillis;
89+
private final long handshakeTimeout;
9090
private final Timer nettyTimer;
9191

9292
private final ClientSocketChannelFactory socketChannelFactory;
@@ -148,7 +148,7 @@ public boolean remove(Object o) {
148148
channelId2KeyPool = null;
149149
}
150150

151-
handshakeTimeoutInMillis = nettyConfig.getHandshakeTimeoutInMillis();
151+
handshakeTimeout = nettyConfig.getHandshakeTimeout();
152152

153153
if (nettyConfig.getSocketChannelFactory() != null) {
154154
socketChannelFactory = nettyConfig.getSocketChannelFactory();
@@ -360,7 +360,7 @@ public SslHandler createSslHandler(String peerHost, int peerPort) throws General
360360
sslEngine.setUseClientMode(true);
361361
}
362362

363-
return handshakeTimeoutInMillis > 0 ? new SslHandler(sslEngine, getDefaultBufferPool(), false, nettyTimer, handshakeTimeoutInMillis)
363+
return handshakeTimeout > 0 ? new SslHandler(sslEngine, getDefaultBufferPool(), false, nettyTimer, handshakeTimeout)
364364
: new SslHandler(sslEngine);
365365
}
366366

0 commit comments

Comments
 (0)