Apache Solr open-source search software
SOLR-16668: Default to Java SSL for Http2SolrClient (#1366)
Houston Putmaneb34d9ffbebe
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex e943fa1c3d6..71363745cee 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -221,6 +221,8 @@ Bug Fixes* SOLR-16670: Fix directory/file check in S3Repository (Houston Putman, Hakan Özler)+* SOLR-16668: Use default to Java SSL for Http2SolrClient when none is provided (Houston Putman)+Build---------------------* Upgrade forbiddenapis to 3.4 (Uwe Schindler)diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.javaindex 74fb58bdb23..7ddd5413610 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java@@ -222,39 +222,32 @@ public class Http2SolrClient extends SolrClient {}SslContextFactory.Client sslContextFactory;- boolean sslEnabled;if (builder.sslConfig == null) {- sslEnabled =- System.getProperty("javax.net.ssl.keyStore") != null- || System.getProperty("javax.net.ssl.trustStore") != null;- sslContextFactory = sslEnabled ? getDefaultSslContextFactory() : null;+ sslContextFactory = getDefaultSslContextFactory();} else {sslContextFactory = builder.sslConfig.createClientContextFactory();- sslEnabled = true;}+ ClientConnector clientConnector = new ClientConnector();+ clientConnector.setReuseAddress(true);+ clientConnector.setSslContextFactory(sslContextFactory);+ clientConnector.setSelectors(2);+HttpClientTransport transport;if (builder.useHttp1_1) {if (log.isDebugEnabled()) {log.debug("Create Http2SolrClient with HTTP/1.1 transport");}- ClientConnector clientConnector = new ClientConnector();- clientConnector.setReuseAddress(true);- clientConnector.setSslContextFactory(sslContextFactory);- clientConnector.setSelectors(2);transport = new HttpClientTransportOverHTTP(clientConnector);-httpClient = new HttpClient(transport);-- if (builder.maxConnectionsPerHost != null)+ if (builder.maxConnectionsPerHost != null) {httpClient.setMaxConnectionsPerDestination(builder.maxConnectionsPerHost);+ }} else {- log.debug("Create Http2SolrClient with HTTP/2 transport");- ClientConnector clientConnector = new ClientConnector();- clientConnector.setReuseAddress(true);- clientConnector.setSslContextFactory(sslContextFactory);- clientConnector.setSelectors(2);+ if (log.isDebugEnabled()) {+ log.debug("Create Http2SolrClient with HTTP/2 transport");+ }HTTP2Client http2client = new HTTP2Client(clientConnector);transport = new HttpClientTransportOverHTTP2(http2client);