You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2016/04/29 18:55:19 UTC

lucene-solr:master: SOLR-9028: relax the SSLHandshakeException expectation - in some platforms/java# diff IOExceptions are thrown

Repository: lucene-solr
Updated Branches:
  refs/heads/master 3d3c3fb5f -> 48f2b2a3b


SOLR-9028: relax the SSLHandshakeException expectation - in some platforms/java# diff IOExceptions are thrown


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/48f2b2a3
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/48f2b2a3
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/48f2b2a3

Branch: refs/heads/master
Commit: 48f2b2a3bbfacd5d2a6d2b395ab573305e8c6612
Parents: 3d3c3fb
Author: Chris Hostetter <ho...@apache.org>
Authored: Fri Apr 29 09:54:56 2016 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Fri Apr 29 09:54:56 2016 -0700

----------------------------------------------------------------------
 .../test/org/apache/solr/cloud/TestMiniSolrCloudClusterSSL.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/48f2b2a3/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterSSL.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterSSL.java b/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterSSL.java
index 3328019..a041348 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterSSL.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterSSL.java
@@ -24,7 +24,6 @@ import java.io.File;
 import java.io.IOException;
 
 import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLHandshakeException;
 
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.client.solrj.embedded.JettyConfig;
@@ -280,7 +279,7 @@ public class TestMiniSolrCloudClusterSSL extends SolrTestCaseJ4 {
           if (sslConfig.isClientAuthMode()) {
             // w/o a valid client cert, SSL connection should fail
 
-            expectThrows(SSLHandshakeException.class, () -> {
+            expectThrows(IOException.class, () -> {
                 doHeadRequest(client, url);
               });
           } else {