[ambari] branch branch-2.7 updated: AMBARI-25114. Log Search: SSL props needs to be set if only ambari-server uses SSL (#2792)

[ol...@apache.org]

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

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


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

commit bb89801e4cc4d3f7b21aa2a78b4df66b282357b2
Author: Olivér Sz <ol...@gmail.com>
AuthorDate: Tue Jan 29 16:20:47 2019 +0100

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

diff --git a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/common/ExternalServerClient.java b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/common/ExternalServerClient.java
index 76d43e5..152cb88 100644
--- a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/common/ExternalServerClient.java
+++ b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/common/ExternalServerClient.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -52,6 +52,9 @@ public class ExternalServerClient {
    */
   public Object sendGETRequest(String loginUrl, Class<?> klass, String username, String password) throws Exception {
     if (localJerseyClient == null) {
+      if (sslConfigurer.isKeyStoreSpecified()) {
+        sslConfigurer.ensureStorePasswords();
+      }
       localJerseyClient = new ThreadLocal<JerseyClient>() {
         @Override
         protected JerseyClient initialValue() {
@@ -70,7 +73,7 @@ public class ExternalServerClient {
 
     WebTarget target = client.target(url);
     LOG.debug("URL: " + url);
-    
+
     Invocation.Builder invocationBuilder =  target.request();
     try {
       Response response = invocationBuilder.get();