Repository: cloudstack Updated Branches: refs/heads/master 0ec36e128 -> b145a7d14
null deref when no project found Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b145a7d1 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b145a7d1 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b145a7d1 Branch: refs/heads/master Commit: b145a7d140a2e070b74ecc0987a554b585e8d5e5 Parents: 0ec36e1 Author: Will Stevens <wstev...@cloudops.com> Authored: Fri Sep 5 10:06:25 2014 -0400 Committer: Will Stevens <wstev...@cloudops.com> Committed: Fri Sep 5 10:06:25 2014 -0400 ---------------------------------------------------------------------- .../org/apache/cloudstack/network/lb/CertServiceImpl.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b145a7d1/server/src/org/apache/cloudstack/network/lb/CertServiceImpl.java ---------------------------------------------------------------------- diff --git a/server/src/org/apache/cloudstack/network/lb/CertServiceImpl.java b/server/src/org/apache/cloudstack/network/lb/CertServiceImpl.java index b5e4a17..695b935 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()); }