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/10/08 02:30:51 UTC
[29/30] lucene-solr:jira/http2: Do not set Conscrypt provider if not
needed
Do not set Conscrypt provider if not needed
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/75e91255
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/75e91255
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/75e91255
Branch: refs/heads/jira/http2
Commit: 75e912559d8fb5f651c207685462b7ed84d440c7
Parents: bb0b9a1
Author: Cao Manh Dat <da...@apache.org>
Authored: Mon Oct 8 09:05:09 2018 +0700
Committer: Cao Manh Dat <da...@apache.org>
Committed: Mon Oct 8 09:05:09 2018 +0700
----------------------------------------------------------------------
.../test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/75e91255/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
----------------------------------------------------------------------
diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
index 9a6bb27..fa5ff65 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
@@ -285,7 +285,10 @@ public abstract class SolrTestCaseJ4 extends LuceneTestCase {
ignoreException("ignore_exception");
newRandomConfig();
- Security.insertProviderAt(new OpenSSLProvider(), 1);
+ // Set Conscrypt as default OpenSSLProvider for all clients
+ if (Security.getProvider("Conscrypt") == null) {
+ Security.insertProviderAt(new OpenSSLProvider(), 1);
+ }
sslConfig = buildSSLConfig();
// based on randomized SSL config, set SchemaRegistryProvider appropriately