Merge "Fix NPE & other sonar issues"
authorManoop Talasila <talasila@research.att.com>
Wed, 23 Oct 2019 17:59:37 +0000 (17:59 +0000)
committerGerrit Code Review <gerrit@onap.org>
Wed, 23 Oct 2019 17:59:37 +0000 (17:59 +0000)

Trivial merge