Repository: cloudstack Updated Branches: refs/heads/master 165618ac9 -> 2f832fddf
CLOUDSTACK-7164: fix NPE Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2f832fdd Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2f832fdd Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2f832fdd Branch: refs/heads/master Commit: 2f832fddff4786dbc3cafd5934cf65e3c6f2db99 Parents: 165618a Author: Edison Su <sudi...@gmail.com> Authored: Thu Jul 24 17:01:23 2014 -0700 Committer: Edison Su <sudi...@gmail.com> Committed: Thu Jul 24 17:01:23 2014 -0700 ---------------------------------------------------------------------- server/src/com/cloud/user/AccountManagerImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2f832fdd/server/src/com/cloud/user/AccountManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/user/AccountManagerImpl.java b/server/src/com/cloud/user/AccountManagerImpl.java index 7a889f1..75a97bc 100755 --- a/server/src/com/cloud/user/AccountManagerImpl.java +++ b/server/src/com/cloud/user/AccountManagerImpl.java @@ -1406,7 +1406,9 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M AccountVO account = _accountDao.findById(accountId); if (account == null || account.getRemoved() != null) { - s_logger.info("The account:" + account.getAccountName() + " is already removed"); + if (account != null) { + s_logger.info("The account:" + account.getAccountName() + " is already removed"); + } return true; }
