diff options
| author |   Dan Timoney <dtimoney@att.com> | 2018-11-30 23:40:16 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-11-30 23:40:16 +0000 |
| commit | 0dccb28ea1cb5b2bcb988e659148d064a0981725 (patch) | |
| tree | 04e35cfa6738b83740c136a36b0df0197a45311a /aai-service/provider/src/main | |
| parent | 2cdcabee378b26873e950e9e96a7b7145dd9cc4e (diff) | |
| parent | 806ebbbc633941654e20326adb7c8b08bff47cfb (diff) | |
Merge "Added fix for potential nullpointerexception"
Diffstat (limited to 'aai-service/provider/src/main')
| -rwxr-xr-x | aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIService.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIService.java b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIService.java index bfed619c..78b0f0eb 100755 --- a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIService.java +++ b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIService.java @@ -285,7 +285,9 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe LOG.error("AAIResource", ex); } - ctx.init(kmf.getKeyManagers(), null, null); + if(null!=kmf) { + ctx.init(kmf.getKeyManagers(), null, null); + } config.getProperties().put(HTTPSProperties.PROPERTY_HTTPS_PROPERTIES, new HTTPSProperties( new HostnameVerifier() { @Override public boolean verify( String s, SSLSession sslSession ) { |