Merge "sonar bug fix: might cause NPE"
authorYan Yang <yangyanyj@chinamobile.com>
Mon, 5 Feb 2018 10:04:51 +0000 (10:04 +0000)
committerGerrit Code Review <gerrit@onap.org>
Mon, 5 Feb 2018 10:04:51 +0000 (10:04 +0000)

Trivial merge