Merge "Fix Sonar bugs and possible NPE in code"
authorJames Forsyth <jf2512@att.com>
Tue, 12 Mar 2019 03:09:19 +0000 (03:09 +0000)
committerGerrit Code Review <gerrit@onap.org>
Tue, 12 Mar 2019 03:09:19 +0000 (03:09 +0000)

Trivial merge