From b9163367a8760d5e4249fce287f638f1ec9dddfb Mon Sep 17 00:00:00 2001
From: Elena Kuleshov <evn@att.com>
Date: Thu, 1 Aug 2019 03:13:04 -0400
Subject: Handle no pservers case on lock check

Check for null return value from pservers query

Issue-ID: SO-2184
Signed-off-by: Kuleshov, Elena <evn@att.com>
Change-Id: I34c71601e694241a6d3cfefa8227200e715e2ed3
---
 .../src/main/java/org/onap/so/client/aai/AAIValidatorImpl.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'common/src/main/java/org')

diff --git a/common/src/main/java/org/onap/so/client/aai/AAIValidatorImpl.java b/common/src/main/java/org/onap/so/client/aai/AAIValidatorImpl.java
index 95ed01ee94..96844ff1cb 100644
--- a/common/src/main/java/org/onap/so/client/aai/AAIValidatorImpl.java
+++ b/common/src/main/java/org/onap/so/client/aai/AAIValidatorImpl.java
@@ -47,10 +47,12 @@ public class AAIValidatorImpl implements AAIValidator {
         List<Pserver> pservers;
         boolean isLocked = false;
         pservers = client.getPhysicalServerByVnfId(vnfId);
-        for (Pserver pserver : pservers) {
-            if (pserver.isInMaint()) {
-                isLocked = true;
-                return isLocked;
+        if (pservers != null) {
+            for (Pserver pserver : pservers) {
+                if (pserver.isInMaint()) {
+                    isLocked = true;
+                    return isLocked;
+                }
             }
         }
         return isLocked;
-- 
cgit 1.2.3-korg