Return-Path: 
 <commits-return-37890-apmail-cloudstack-commits-archive=cloudstack.apache.org@cloudstack.apache.org>
X-Original-To: apmail-cloudstack-commits-archive@www.apache.org
Delivered-To: apmail-cloudstack-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 562E610C63
	for <apmail-cloudstack-commits-archive@www.apache.org>;
 Fri,  7 Feb 2014 22:14:23 +0000 (UTC)
Received: (qmail 27190 invoked by uid 500); 7 Feb 2014 22:14:23 -0000
Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org
Received: (qmail 27163 invoked by uid 500); 7 Feb 2014 22:14:22 -0000
Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cloudstack.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cloudstack.apache.org>
List-Post: <mailto:commits@cloudstack.apache.org>
List-Id: <commits.cloudstack.apache.org>
Reply-To: dev@cloudstack.apache.org
Delivered-To: mailing list commits@cloudstack.apache.org
Received: (qmail 27156 invoked by uid 99); 7 Feb 2014 22:14:22 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Feb 2014 22:14:22 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 6466991FBAA; Fri,  7 Feb 2014 22:14:22 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: mchen@apache.org
To: commits@cloudstack.apache.org
Message-Id: <0432e40817a644838e7602ed5ce92129@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: git commit: updated refs/heads/rbac to 0b5b861
Date: Fri,  7 Feb 2014 22:14:22 +0000 (UTC)

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);