@@ -328,11 +328,10 @@ public HttpConnectionManager(Registry<ConnectionSocketFactory> socketFactory, Cl
328
328
.build ();
329
329
setDefaultConnectionConfig (connConfig );
330
330
331
- SocketConfig .Builder builder = SocketConfig .custom ();
332
-
333
- if (config .hasOption (ClickHouseClientOption .SOCKET_TIMEOUT )) {
334
- builder .setSoTimeout (config .getIntOption (ClickHouseClientOption .SOCKET_TIMEOUT ), TimeUnit .MILLISECONDS );
335
- }
331
+ SocketConfig .Builder builder = SocketConfig .custom ()
332
+ .setSoTimeout (Timeout .of (config .getSocketTimeout (), TimeUnit .MILLISECONDS ))
333
+ .setRcvBufSize (config .getReadBufferSize ())
334
+ .setSndBufSize (config .getWriteBufferSize ());
336
335
if (config .hasOption (ClickHouseClientOption .SOCKET_KEEPALIVE )) {
337
336
builder .setSoKeepAlive (config .getBoolOption (ClickHouseClientOption .SOCKET_KEEPALIVE ));
338
337
}
@@ -343,14 +342,6 @@ public HttpConnectionManager(Registry<ConnectionSocketFactory> socketFactory, Cl
343
342
if (config .hasOption (ClickHouseClientOption .SOCKET_REUSEADDR )) {
344
343
builder .setSoReuseAddress (config .getBoolOption (ClickHouseClientOption .SOCKET_REUSEADDR ));
345
344
}
346
- if (config .hasOption (ClickHouseClientOption .SOCKET_RCVBUF )) {
347
- int bufferSize = config .getIntOption (ClickHouseClientOption .SOCKET_RCVBUF );
348
- builder .setRcvBufSize (bufferSize > 0 ? bufferSize : config .getReadBufferSize ());
349
- }
350
- if (config .hasOption (ClickHouseClientOption .SOCKET_SNDBUF )) {
351
- int bufferSize = config .getIntOption (ClickHouseClientOption .SOCKET_SNDBUF );
352
- builder .setSndBufSize (bufferSize > 0 ? bufferSize : config .getWriteBufferSize ());
353
- }
354
345
if (config .hasOption (ClickHouseClientOption .SOCKET_TCP_NODELAY )) {
355
346
builder .setTcpNoDelay (config .getBoolOption (ClickHouseClientOption .SOCKET_TCP_NODELAY ));
356
347
}
0 commit comments