From: burdziak <olaf.burdziakowski@nokia.com>
Date: Tue, 30 Jan 2018 08:41:17 +0000 (+0100)
Subject: Fix in HttpsAuthClient
X-Git-Tag: v1.2.0~11
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=be11a57ad69af3bb8019adfb67578936b0e1eec0;p=aai%2Faai-common.git

Fix in HttpsAuthClient

Change-Id: Ifa266c4b86d81c114956028fa2d7c59e4a0aaaae
Issue-ID: AAI-705
Signed-off-by: burdziak <olaf.burdziakowski@nokia.com>
---

diff --git a/aai-core/src/main/java/org/onap/aai/util/HttpsAuthClient.java b/aai-core/src/main/java/org/onap/aai/util/HttpsAuthClient.java
index 5deb48ae..9d15f095 100644
--- a/aai-core/src/main/java/org/onap/aai/util/HttpsAuthClient.java
+++ b/aai-core/src/main/java/org/onap/aai/util/HttpsAuthClient.java
@@ -106,13 +106,13 @@ public class HttpsAuthClient{
 				char[] pwd = keystore_password.toCharArray();
 				ks.load(fin, pwd);
 				kmf.init(ks, pwd);
+				ctx.init(kmf.getKeyManagers(), null, null);
 			} catch (Exception e) {
 				System.out.println("Error setting up kmf: exiting");
 				e.printStackTrace();
 				System.exit(1);
 			}
 
-			ctx.init(kmf.getKeyManagers(), null, null);
 			config.getProperties().put(HTTPSProperties.PROPERTY_HTTPS_PROPERTIES, 
 										new HTTPSProperties( new HostnameVerifier() {
 				@Override