[ambari-logsearch] branch master updated: AMBARI-25114. Log Search: SSL props needs to be set if only ambari-server uses SSL.

[ol...@apache.org]

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

oleewere pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ambari-logsearch.git


The following commit(s) were added to refs/heads/master by this push:
     new 3293b96  AMBARI-25114. Log Search: SSL props needs to be set if only ambari-server uses SSL.
3293b96 is described below

commit 3293b96c6a6dab82d8434bde5b314a7519cf2e51
Author: Oliver Szabo <ol...@gmail.com>
AuthorDate: Sat Jan 19 03:36:15 2019 +0100

    AMBARI-25114. Log Search: SSL props needs to be set if only ambari-server uses SSL.
---
 .../java/org/apache/ambari/logsearch/common/ExternalServerClient.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/common/ExternalServerClient.java b/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/common/ExternalServerClient.java
index 31ab03e..38bedf5 100644
--- a/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/common/ExternalServerClient.java
+++ b/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/common/ExternalServerClient.java
@@ -59,6 +59,9 @@ public class ExternalServerClient {
    */
   public Object sendGETRequest(String loginUrl, Class<?> classObject, String username, String password) throws Exception {
     if (localJerseyClient == null) {
+      if (sslConfigurer.isKeyStoreSpecified()) {
+        sslConfigurer.ensureStorePasswords();
+      }
       localJerseyClient = ThreadLocal.withInitial(() -> sslConfigurer.isKeyStoreSpecified() ?
         new JerseyClientBuilder().sslContext(sslConfigurer.getSSLContext()).build() :
         JerseyClientBuilder.createClient());