X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fdatarouter%2Futil%2FSearchServiceAgent.java;h=4baa81a2597d611e474a96c07e64d81f304ff7fb;hb=10c04810902a100fbeba93dda5b13329ada39117;hp=bbdb4c8edd38135f1c417d5bcd37fc8e107a31f5;hpb=9939a1d4a4d390cfb89829ad253d94f8f4102ac5;p=aai%2Fdata-router.git

diff --git a/src/main/java/org/onap/aai/datarouter/util/SearchServiceAgent.java b/src/main/java/org/onap/aai/datarouter/util/SearchServiceAgent.java
index bbdb4c8..4baa81a 100644
--- a/src/main/java/org/onap/aai/datarouter/util/SearchServiceAgent.java
+++ b/src/main/java/org/onap/aai/datarouter/util/SearchServiceAgent.java
@@ -96,14 +96,14 @@ public class SearchServiceAgent {
                           String documentEndpoint, 
                           Logger logger) {
     
+    String deobfuscatedCertPassword = keystorePwd.startsWith("OBF:")?Password.deobfuscate(keystorePwd):keystorePwd;
     // Create REST client for search service
     searchClient = new RestClient()
                     .authenticationMode(RestAuthenticationMode.SSL_CERT)
                     .validateServerHostname(false)
-                    .validateServerCertChain(true)
+                    .validateServerCertChain(false)
                     .clientCertFile(DataRouterConstants.DR_HOME_AUTH + certName)
-                    .clientCertPassword(Password.deobfuscate(keystorePwd))
-                    .trustStore(DataRouterConstants.DR_HOME_AUTH + keystore);
+                    .clientCertPassword(deobfuscatedCertPassword);                    
     
     this.searchUrl        = searchUrl;
     this.documentEndpoint = documentEndpoint;