Skip to content

Commit 82cbb6a

Browse files
committed
fix NPE in proxy configuration
1 parent 9380c5d commit 82cbb6a

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

client-v2/src/main/java/com/clickhouse/client/api/internal/HttpAPIClientHelper.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
import java.net.URISyntaxException;
4040
import java.net.UnknownHostException;
4141
import java.util.Base64;
42+
import java.util.EnumSet;
4243
import java.util.Map;
4344
import java.util.concurrent.TimeUnit;
4445
import java.util.function.Function;
@@ -77,7 +78,9 @@ public CloseableHttpClient createHttpClient() {
7778
proxy = new HttpHost(proxyHost, Integer.parseInt(proxyPort));
7879
}
7980

80-
ProxyType proxyType = ProxyType.valueOf(chConfiguration.get(ClickHouseClientOption.PROXY_TYPE.getKey()));
81+
82+
String proxyTypeVal = chConfiguration.get(ClickHouseClientOption.PROXY_TYPE.getKey());
83+
ProxyType proxyType = proxyTypeVal == null ? null : ProxyType.valueOf(proxyTypeVal);
8184
if (proxyType == ProxyType.HTTP) {
8285
clientBuilder.setProxy(proxy);
8386
if (chConfiguration.containsKey("proxy_password") && chConfiguration.containsKey("proxy_user")) {

0 commit comments

Comments
 (0)