You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by da...@apache.org on 2018/09/03 08:59:18 UTC
lucene-solr:jira/http2: Build SslContextFactory from Sysprops when
use http1
Repository: lucene-solr
Updated Branches:
refs/heads/jira/http2 b378bb5c0 -> a1f140f4d
Build SslContextFactory from Sysprops when use http1
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/a1f140f4
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/a1f140f4
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/a1f140f4
Branch: refs/heads/jira/http2
Commit: a1f140f4dcc035a08051b207653fd072b4ce7197
Parents: b378bb5
Author: Cao Manh Dat <da...@apache.org>
Authored: Mon Sep 3 15:02:08 2018 +0700
Committer: Cao Manh Dat <da...@apache.org>
Committed: Mon Sep 3 15:02:08 2018 +0700
----------------------------------------------------------------------
.../solr/client/solrj/impl/Http2SolrClient.java | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a1f140f4/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
----------------------------------------------------------------------
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.java
index 8342a4a..e358aa9 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
@@ -197,20 +197,18 @@ public class Http2SolrClient extends SolrClient {
httpClientExecutor.setDaemon(true);
HttpClientTransport transport;
- boolean useHttps = serverBaseUrl != null && serverBaseUrl.startsWith("https");
- SslContextFactory sslContextFactory = null;
- if (useHttps && builder.sslConfig == null) {
- LOG.info("SSLConfig is not provided, building SslContextFactory from System.properties");
- sslContextFactory = getDefaultSslContextFactory();
- }
- if (builder.sslConfig != null) {
- sslContextFactory = builder.sslConfig.createContextFactory();
- }
-
- if (builder.useHttp1_1 || sslContextFactory != null) {
+ if (builder.useHttp1_1 || builder.sslConfig != null) {
transport = new HttpClientTransportOverHTTP(2);
+
+ SslContextFactory sslContextFactory;
+ if (builder.sslConfig == null) {
+ sslContextFactory = getDefaultSslContextFactory();
+ } else {
+ sslContextFactory = builder.sslConfig.createContextFactory();
+ }
httpClient = new HttpClient(transport, sslContextFactory);
} else {
+ //TODO adding https support for HTTP2 when use JDK 9
HTTP2Client http2client = new HTTP2Client();
transport = new HttpClientTransportOverHTTP2(http2client);
httpClient = new HttpClient(transport, null);