commit 078325f8ef05a6216292f5331ef0805a5bdd9ef1
author Jonathan Gathman <jonathan.gathman@att.com> Wed Jul 03 14:08:19 2019 +0000
committer Gerrit Code Review <gerrit@onap.org> Wed Jul 03 14:08:19 2019 +0000
tree f8e57d1065289a141ef035ab640c232fefa36f6b
parent feab2592f964ff68e04812aeafc807b4ce71048c
parent ae776a1394b7edc9c42db471b48b330d6789643b

Merge "Fixed deref of null object at error message"

auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/hl/Function.java

diff --git a/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/hl/Function.java b/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/hl/Function.java
index 3fde512..c59312c 100644
--- a/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/hl/Function.java
+++ b/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/hl/Function.java
@@ -628,7 +628,12 @@
                 return Result.err(Status.ERR_DependencyExists, sb.toString());
             }
 
-            if (move && (parent == null || parent.type == NsType.COMPANY.type)) {
+            if (move && parent == null) {
+                return Result
+                        .err(Status.ERR_DependencyExists,
+                                "Cannot move users, roles or permissions - parent is missing.\nDelete dependencies and try again");
+            }
+            else if (move && parent.type == NsType.COMPANY.type) {
                 return Result
                         .err(Status.ERR_DependencyExists,
                                 "Cannot move users, roles or permissions to [%s].\nDelete dependencies and try again",