From 909ec57327c77dc644bfe8f510ebf4da6838cc86 Mon Sep 17 00:00:00 2001 From: prachi Date: Mon, 26 Mar 2012 14:29:17 -0700 Subject: [PATCH] Bug 14482 - When user tries to delete an acquired Ip address ,right after this is successful, UI calls listRemoteAccessVpns() which results in java.lang.NullPointerException.User is presented with "Internal error executing command" error Reviewed-By: Sheng Changes: - Added the null check for account object. --- server/src/com/cloud/acl/DomainChecker.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/com/cloud/acl/DomainChecker.java b/server/src/com/cloud/acl/DomainChecker.java index a844e8c15f9..988942040e2 100755 --- a/server/src/com/cloud/acl/DomainChecker.java +++ b/server/src/com/cloud/acl/DomainChecker.java @@ -115,7 +115,7 @@ public class DomainChecker extends AdapterBase implements SecurityChecker { if (caller.getType() == Account.ACCOUNT_TYPE_NORMAL) { Account account = _accountDao.findById(entity.getAccountId()); - if (account.getType() == Account.ACCOUNT_TYPE_PROJECT) { + if (account != null && account.getType() == Account.ACCOUNT_TYPE_PROJECT) { //only project owner can delete/modify the project if (accessType != null && accessType == AccessType.ModifyProject) { if (!_projectMgr.canModifyProjectAccount(caller, account.getId())) {