You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by sm...@apache.org on 2015/02/11 18:22:02 UTC
directory-fortress-core git commit: FC-64 - check for null
Repository: directory-fortress-core
Updated Branches:
refs/heads/master 20fd327af -> b5cb0d9de
FC-64 - check for null
Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/commit/b5cb0d9d
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/b5cb0d9d
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/b5cb0d9d
Branch: refs/heads/master
Commit: b5cb0d9def4b244509f615b4288f368908da9c13
Parents: 20fd327
Author: Shawn McKinney <sm...@apache.org>
Authored: Wed Feb 11 11:21:49 2015 -0600
Committer: Shawn McKinney <sm...@apache.org>
Committed: Wed Feb 11 11:21:49 2015 -0600
----------------------------------------------------------------------
.../org/apache/directory/fortress/core/rbac/AdminRoleDAO.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/b5cb0d9d/src/main/java/org/apache/directory/fortress/core/rbac/AdminRoleDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/AdminRoleDAO.java b/src/main/java/org/apache/directory/fortress/core/rbac/AdminRoleDAO.java
index 3b006c6..78a7b46 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/AdminRoleDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/AdminRoleDAO.java
@@ -684,7 +684,11 @@ final class AdminRoleDAO extends ApacheDsDataProvider
entity.setRoleRangeRaw( getAttribute( le, ROLE_RANGE ) );
//entity.setParents(AdminRoleUtil.getParents(entity.getName().toUpperCase(), contextId));
entity.setParents( getAttributeSet( le, GlobalIds.PARENT_NODES ) );
- entity.setChildren( AdminRoleUtil.getChildren( entity.getName().toUpperCase(), contextId ) );
+ Set<String> children = AdminRoleUtil.getChildren( entity.getName().toUpperCase(), contextId );
+ if(VUtil.isNotNullOrEmpty( children ))
+ {
+ entity.setChildren( children );
+ }
return entity;
}