You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by mi...@apache.org on 2020/01/03 10:31:41 UTC

[httpcomponents-core] branch HTTPCORE-622 created (now f499047)

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

michaelo pushed a change to branch HTTPCORE-622
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git.


      at f499047  [HTTPCORE-622] JSSEProviderIntegrationTest fails if Conscrypt JNI wrapper cannot be loaded

This branch includes the following new commits:

     new f499047  [HTTPCORE-622] JSSEProviderIntegrationTest fails if Conscrypt JNI wrapper cannot be loaded

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



[httpcomponents-core] 01/01: [HTTPCORE-622] JSSEProviderIntegrationTest fails if Conscrypt JNI wrapper cannot be loaded

Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch HTTPCORE-622
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git

commit f4990479680acd503b09ea6a9b9584b89014b7f9
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Fri Jan 3 11:31:16 2020 +0100

    [HTTPCORE-622] JSSEProviderIntegrationTest fails if Conscrypt JNI wrapper cannot be loaded
---
 .../apache/hc/core5/testing/nio/JSSEProviderIntegrationTest.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/JSSEProviderIntegrationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/JSSEProviderIntegrationTest.java
index 6d0c3bd..5ddd0c1 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/JSSEProviderIntegrationTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/JSSEProviderIntegrationTest.java
@@ -116,7 +116,11 @@ public class JSSEProviderIntegrationTest {
         @Override
         protected void before() throws Throwable {
             if ("Conscrypt".equalsIgnoreCase(securityProviderName)) {
-                securityProvider = Conscrypt.newProviderBuilder().provideTrustManager(true).build();
+                try {
+                    securityProvider = Conscrypt.newProviderBuilder().provideTrustManager(true).build();
+                } catch (final UnsatisfiedLinkError e) {
+                    Assume.assumeFalse("Conscrypt provider failed to be loaded: " + e.getMessage(), true);
+                }
             } else {
                 securityProvider = null;
             }