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/12/11 20:33:11 UTC
lucene-solr:jira/http2: Fix merge error,
SSLTestConfig should handle Java 11 problem
Repository: lucene-solr
Updated Branches:
refs/heads/jira/http2 fb3bcecdf -> c8c7dcb79
Fix merge error, SSLTestConfig should handle Java 11 problem
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/c8c7dcb7
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/c8c7dcb7
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/c8c7dcb7
Branch: refs/heads/jira/http2
Commit: c8c7dcb790932fb48aec156e6c2ac07e6cf9d57b
Parents: fb3bcec
Author: Cao Manh Dat <da...@apache.org>
Authored: Wed Dec 12 03:32:53 2018 +0700
Committer: Cao Manh Dat <da...@apache.org>
Committed: Wed Dec 12 03:32:53 2018 +0700
----------------------------------------------------------------------
.../org/apache/solr/client/solrj/embedded/SSLConfig.java | 8 +-------
.../src/java/org/apache/solr/util/SSLTestConfig.java | 8 +++++++-
2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c8c7dcb7/solr/solrj/src/java/org/apache/solr/client/solrj/embedded/SSLConfig.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/embedded/SSLConfig.java b/solr/solrj/src/java/org/apache/solr/client/solrj/embedded/SSLConfig.java
index 4ea9f70..4091bf7 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/embedded/SSLConfig.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/embedded/SSLConfig.java
@@ -16,7 +16,6 @@
*/
package org.apache.solr.client.solrj.embedded;
-import org.apache.solr.client.solrj.util.Constants;
import org.eclipse.jetty.util.ssl.SslContextFactory;
/**
@@ -35,12 +34,7 @@ public class SSLConfig {
/** NOTE: all other settings are ignored if useSSL is false; trustStore settings are ignored if clientAuth is false */
public SSLConfig(boolean useSSL, boolean clientAuth, String keyStore, String keyStorePassword, String trustStore, String trustStorePassword) {
- // @AwaitsFix: SOLR-12988 - ssl issues on Java 11/12
- if (Constants.JRE_IS_MINIMUM_JAVA11) {
- this.useSsl = false;
- } else {
- this.useSsl = useSSL;
- }
+ this.useSsl = useSSL;
this.clientAuth = clientAuth;
this.keyStore = keyStore;
this.keyStorePassword = keyStorePassword;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c8c7dcb7/solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java
----------------------------------------------------------------------
diff --git a/solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java b/solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java
index f6281e1..b21b6fa 100644
--- a/solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java
+++ b/solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java
@@ -39,6 +39,7 @@ import org.apache.http.ssl.SSLContexts;
import org.apache.solr.client.solrj.embedded.SSLConfig;
import org.apache.solr.client.solrj.impl.HttpClientUtil;
import org.apache.solr.client.solrj.impl.HttpClientUtil.SchemaRegistryProvider;
+import org.apache.solr.client.solrj.util.Constants;
import org.eclipse.jetty.util.resource.Resource;
import org.eclipse.jetty.util.security.CertificateUtils;
import org.eclipse.jetty.util.ssl.SslContextFactory;
@@ -100,7 +101,12 @@ public class SSLTestConfig {
* @see HttpClientUtil#SYS_PROP_CHECK_PEER_NAME
*/
public SSLTestConfig(boolean useSSL, boolean clientAuth, boolean checkPeerName) {
- this.useSsl = useSSL;
+ // @AwaitsFix: SOLR-12988 - ssl issues on Java 11/12
+ if (Constants.JRE_IS_MINIMUM_JAVA11) {
+ this.useSsl = false;
+ } else {
+ this.useSsl = useSSL;
+ }
this.clientAuth = clientAuth;
this.checkPeerName = checkPeerName;