[lucene-solr] branch branch_8x updated: SOLR-12988: Fix Revert

[ho...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

hossman pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/branch_8x by this push:
     new 456bc4d  SOLR-12988: Fix Revert
456bc4d is described below

commit 456bc4dbf978f9a7c2bc16fc009057683bd7b2ca
Author: Chris Hostetter <ho...@apache.org>
AuthorDate: Thu Jun 20 16:03:30 2019 -0700

    SOLR-12988: Fix Revert
    
    an (erroneous) assigment to useSsl was left in the constructor after the (intended) conditional assigment, rendering the conditional logic useless
    
    (cherry picked from commit c8c2f2f25b28da694fae88868b12347bc5a2393c)
---
 solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java | 1 -
 1 file changed, 1 deletion(-)

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 fb21ef7..502df40 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
@@ -105,7 +105,6 @@ public class SSLTestConfig {
     } else {
       this.useSsl = useSSL;
     }
-    this.useSsl = useSSL;
     this.clientAuth = clientAuth;
     this.checkPeerName = checkPeerName;