mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
fix npe on account creation (#10274)
This commit is contained in:
parent
d9af9bdb36
commit
c70e4e29be
@ -1341,7 +1341,7 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M
|
|||||||
*/
|
*/
|
||||||
private void checkRoleEscalation(Account caller, Account requested) {
|
private void checkRoleEscalation(Account caller, Account requested) {
|
||||||
if (s_logger.isDebugEnabled()) {
|
if (s_logger.isDebugEnabled()) {
|
||||||
s_logger.debug(String.format("checking if user of account %s [%s] with role-id [%d] can create an account of type %s [%s] with role-id [%d]",
|
s_logger.debug(String.format("Checking if user of account %s [%s] with role-id [%d] can create an account of type %s [%s] with role-id [%d]",
|
||||||
caller.getAccountName(),
|
caller.getAccountName(),
|
||||||
caller.getUuid(),
|
caller.getUuid(),
|
||||||
caller.getRoleId(),
|
caller.getRoleId(),
|
||||||
@ -1355,12 +1355,13 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M
|
|||||||
checkApiAccess(apiCheckers, requested, command);
|
checkApiAccess(apiCheckers, requested, command);
|
||||||
} catch (PermissionDeniedException pde) {
|
} catch (PermissionDeniedException pde) {
|
||||||
if (s_logger.isTraceEnabled()) {
|
if (s_logger.isTraceEnabled()) {
|
||||||
s_logger.trace(String.format("checking for permission to \"%s\" is irrelevant as it is not requested for %s [%s]",
|
s_logger.trace(String.format(
|
||||||
|
"Checking for permission to \"%s\" is irrelevant as it is not requested for %s [%s]",
|
||||||
command,
|
command,
|
||||||
pde.getAccount().getAccountName(),
|
requested.getAccountName(),
|
||||||
pde.getAccount().getUuid(),
|
requested.getUuid()
|
||||||
pde.getEntitiesInViolation()
|
)
|
||||||
));
|
);
|
||||||
}
|
}
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user