summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--aai-core/src/main/java/org/onap/aai/db/schema/AuditOXM.java11
-rw-r--r--aai-core/src/main/java/org/onap/aai/util/HttpsAuthClient.java2
2 files changed, 3 insertions, 10 deletions
diff --git a/aai-core/src/main/java/org/onap/aai/db/schema/AuditOXM.java b/aai-core/src/main/java/org/onap/aai/db/schema/AuditOXM.java
index 0a3650fa..5ebfeb20 100644
--- a/aai-core/src/main/java/org/onap/aai/db/schema/AuditOXM.java
+++ b/aai-core/src/main/java/org/onap/aai/db/schema/AuditOXM.java
@@ -106,15 +106,8 @@ public class AuditOXM extends Auditor {
for (int i = 0; i < list.getLength(); i++) {
result.add(list.item(i).getAttributes().getNamedItem("name").getNodeValue());
}
- } catch (ParserConfigurationException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (SAXException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ } catch (ParserConfigurationException | SAXException | IOException e) {
+ LOGGER.error(e.getMessage());
}
result.remove("EdgePropNames");
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