etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix a NPE bug in listAclPolicies.

This commit is contained in:
Min Chen 2014-02-13 17:57:49 -08:00
parent 8072e50845
commit 4b75fa806a
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
services/iam/plugin/src/org/apache/cloudstack/acl/api/AclApiServiceImpl.java
View File

@ -469,8 +469,12 @@ public class AclApiServiceImpl extends ManagerBase implements AclApiService, Man
for (AclPolicyPermission permission : permissions) {
AclPermissionResponse perm = new AclPermissionResponse();
perm.setAction(permission.getAction());
perm.setEntityType(AclEntityType.valueOf(permission.getEntityType()));
perm.setScope(PermissionScope.valueOf(permission.getScope()));
if (permission.getEntityType() != null) {
perm.setEntityType(AclEntityType.valueOf(permission.getEntityType()));
}
if (permission.getScope() != null) {
perm.setScope(PermissionScope.valueOf(permission.getScope()));
}
perm.setScopeId(permission.getScopeId());
perm.setPermission(permission.getPermission());
response.addPermission(perm);