cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mc...@apache.org
Subject git commit: updated refs/heads/rbac to 0b5b861
Date Fri, 07 Feb 2014 22:14:22 GMT
Updated Branches:
  refs/heads/rbac 3b58a45e0 -> 0b5b86199


Fix a bug in listParentAclGroups to handle empty parent group case.

Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0b5b8619
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0b5b8619
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0b5b8619

Branch: refs/heads/rbac
Commit: 0b5b861994b14abb95c461489ba6191436d189a8
Parents: 3b58a45
Author: Min Chen <min.chen@citrix.com>
Authored: Fri Feb 7 14:13:56 2014 -0800
Committer: Min Chen <min.chen@citrix.com>
Committed: Fri Feb 7 14:13:56 2014 -0800

----------------------------------------------------------------------
 .../src/org/apache/cloudstack/iam/server/IAMServiceImpl.java     | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0b5b8619/services/iam/server/src/org/apache/cloudstack/iam/server/IAMServiceImpl.java
----------------------------------------------------------------------
diff --git a/services/iam/server/src/org/apache/cloudstack/iam/server/IAMServiceImpl.java
b/services/iam/server/src/org/apache/cloudstack/iam/server/IAMServiceImpl.java
index 853c417..84ed545 100644
--- a/services/iam/server/src/org/apache/cloudstack/iam/server/IAMServiceImpl.java
+++ b/services/iam/server/src/org/apache/cloudstack/iam/server/IAMServiceImpl.java
@@ -276,6 +276,10 @@ public class IAMServiceImpl extends ManagerBase implements IAMService,
Manager {
             }
         }
 
+        if (pathList.isEmpty()) {
+            return new ArrayList<AclGroup>();
+        }
+
         SearchBuilder<AclGroupVO> sb = _aclGroupDao.createSearchBuilder();
         sb.and("paths", sb.entity().getPath(), SearchCriteria.Op.IN);
 


Mime
View raw message