From: shashikanth <shashikanth.vh@huawei.com>
Date: Thu, 21 Sep 2017 05:30:20 +0000 (+0530)
Subject: Fixed vOut nullpointer exception
X-Git-Tag: v1.1.0~29^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=b9bbf9ca774eccdd0961ffd1829ec17e24e25efd;p=aai%2Faai-common.git

Fixed vOut nullpointer exception

Fix Blocker/Critical sonar issues in aai/aai-common module
https://sonar.onap.org/component_issues?id=org.onap.aai.aai-common%3Aaai-common#resolved=false|severities=BLOCKER

NullPointerException might be thrown as 'vOut' is nullable here

Issue-Id:AAI-246
Change-Id: Idc3cc538bc65fc5a7350d6fe72406a5c4dca6f1c
Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>
---

diff --git a/aai-core/src/main/java/org/openecomp/aai/dbgen/DataGrooming.java b/aai-core/src/main/java/org/openecomp/aai/dbgen/DataGrooming.java
index 8dca75c5..f2d6a4b8 100644
--- a/aai-core/src/main/java/org/openecomp/aai/dbgen/DataGrooming.java
+++ b/aai-core/src/main/java/org/openecomp/aai/dbgen/DataGrooming.java
@@ -938,7 +938,7 @@ public class DataGrooming {
 										if( (ghost2 != null) && ghost2FixOn ){
 											ghost2.remove();
 										}
-										else {
+										else if (vOut != null) {
 											vOut.remove();
 										}
 										if (singleCommits) {