You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mc...@apache.org on 2014/01/18 03:14:22 UTC
git commit: updated refs/heads/rbac to 82bdde7
Updated Branches:
refs/heads/rbac b44413616 -> 82bdde70a
Fix NPE during MS startup.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/82bdde70
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/82bdde70
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/82bdde70
Branch: refs/heads/rbac
Commit: 82bdde70a23198146fb922bff3e524c6e4289605
Parents: b444136
Author: Min Chen <mi...@citrix.com>
Authored: Fri Jan 17 18:14:04 2014 -0800
Committer: Min Chen <mi...@citrix.com>
Committed: Fri Jan 17 18:14:04 2014 -0800
----------------------------------------------------------------------
.../src/org/apache/cloudstack/acl/RoleBasedAPIAccessChecker.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/82bdde70/services/iam/plugin/src/org/apache/cloudstack/acl/RoleBasedAPIAccessChecker.java
----------------------------------------------------------------------
diff --git a/services/iam/plugin/src/org/apache/cloudstack/acl/RoleBasedAPIAccessChecker.java b/services/iam/plugin/src/org/apache/cloudstack/acl/RoleBasedAPIAccessChecker.java
index 11110b2..67b6f46 100644
--- a/services/iam/plugin/src/org/apache/cloudstack/acl/RoleBasedAPIAccessChecker.java
+++ b/services/iam/plugin/src/org/apache/cloudstack/acl/RoleBasedAPIAccessChecker.java
@@ -106,7 +106,9 @@ public class RoleBasedAPIAccessChecker extends AdapterBase implements APIChecker
for (RoleType role : RoleType.values()) {
Long policyId = getDefaultPolicyId(role);
- _iamSrv.resetAclPolicy(policyId);
+ if (policyId != null) {
+ _iamSrv.resetAclPolicy(policyId);
+ }
}
for (PluggableService service : _services) {