Merge "Fix critical sonar issues"

author Dan Timoney <dtimoney@att.com>

Tue, 19 Sep 2017 23:52:47 +0000 (23:52 +0000)

committer Gerrit Code Review <gerrit@onap.org>

Tue, 19 Sep 2017 23:52:47 +0000 (23:52 +0000)
author Dan Timoney <dtimoney@att.com>
Tue, 19 Sep 2017 23:52:47 +0000 (23:52 +0000)
committer Gerrit Code Review <gerrit@onap.org>
Tue, 19 Sep 2017 23:52:47 +0000 (23:52 +0000)
diff --cc dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/SdncFlatJsonDmaapConsumer.java
Simple merge
author	Dan Timoney <dtimoney@att.com>
	Tue, 19 Sep 2017 23:52:47 +0000 (23:52 +0000)
committer	Gerrit Code Review <gerrit@onap.org>
	Tue, 19 Sep 2017 23:52:47 +0000 (23:52 +0000)