You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by pr...@apache.org on 2014/01/31 21:01:37 UTC
git commit: updated refs/heads/rbac to 09eed37
Updated Branches:
refs/heads/rbac d12422bf6 -> 09eed3705
Fix for NPE in the dao
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/09eed370
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/09eed370
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/09eed370
Branch: refs/heads/rbac
Commit: 09eed3705daa18d36eb478b6bca7bb215e4279f7
Parents: d12422b
Author: Prachi Damle <pr...@cloud.com>
Authored: Fri Jan 31 12:00:26 2014 -0800
Committer: Prachi Damle <pr...@cloud.com>
Committed: Fri Jan 31 12:00:26 2014 -0800
----------------------------------------------------------------------
.../cloudstack/iam/server/dao/AclPolicyPermissionDaoImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/09eed370/services/iam/server/src/org/apache/cloudstack/iam/server/dao/AclPolicyPermissionDaoImpl.java
----------------------------------------------------------------------
diff --git a/services/iam/server/src/org/apache/cloudstack/iam/server/dao/AclPolicyPermissionDaoImpl.java b/services/iam/server/src/org/apache/cloudstack/iam/server/dao/AclPolicyPermissionDaoImpl.java
index 1b26616..054c8f1 100644
--- a/services/iam/server/src/org/apache/cloudstack/iam/server/dao/AclPolicyPermissionDaoImpl.java
+++ b/services/iam/server/src/org/apache/cloudstack/iam/server/dao/AclPolicyPermissionDaoImpl.java
@@ -62,8 +62,8 @@ public class AclPolicyPermissionDaoImpl extends GenericDaoBase<AclPolicyPermissi
actionScopeSearch.done();
entitySearch = createSearchBuilder();
- entitySearch.and("entityType", fullSearch.entity().getEntityType(), SearchCriteria.Op.EQ);
- entitySearch.and("scopeId", fullSearch.entity().getScopeId(), SearchCriteria.Op.EQ);
+ entitySearch.and("entityType", entitySearch.entity().getEntityType(), SearchCriteria.Op.EQ);
+ entitySearch.and("scopeId", entitySearch.entity().getScopeId(), SearchCriteria.Op.EQ);
entitySearch.done();
return true;