Merge "avoid null exception"
authorChuanyu Chen <chenchuanyu@huawei.com>
Fri, 20 Apr 2018 01:50:33 +0000 (01:50 +0000)
committerGerrit Code Review <gerrit@onap.org>
Fri, 20 Apr 2018 01:50:33 +0000 (01:50 +0000)

Trivial merge