From b145a7d140a2e070b74ecc0987a554b585e8d5e5 Mon Sep 17 00:00:00 2001 From: Will Stevens Date: Fri, 5 Sep 2014 10:06:25 -0400 Subject: [PATCH] null deref when no project found --- .../apache/cloudstack/network/lb/CertServiceImpl.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/server/src/org/apache/cloudstack/network/lb/CertServiceImpl.java b/server/src/org/apache/cloudstack/network/lb/CertServiceImpl.java index b5e4a175989..695b935b193 100644 --- a/server/src/org/apache/cloudstack/network/lb/CertServiceImpl.java +++ b/server/src/org/apache/cloudstack/network/lb/CertServiceImpl.java @@ -302,8 +302,13 @@ public class CertServiceImpl implements CertService { if (account.getType() == Account.ACCOUNT_TYPE_PROJECT) { // find the project Project project = _projectMgr.findByProjectAccountIdIncludingRemoved(account.getId()); - response.setProjectId(project.getUuid()); - response.setProjectName(project.getName()); + if (project != null) + { + response.setProjectId(project.getUuid()); + response.setProjectName(project.getName()); + } else { + response.setAccountName(account.getAccountName()); + } } else { response.setAccountName(account.getAccountName()); }