Code Review
/
aaf
/
authz.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Fixed deref of null object at error message"
[aaf/authz.git]
/
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
(file)
--- 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
@@
public class Function {
return Result.err(Status.ERR_DependencyExists, sb.toString());
}
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",
return Result
.err(Status.ERR_DependencyExists,
"Cannot move users, roles or permissions to [%s].\nDelete dependencies and try again",