null deref when no project found

cloudops-wstevens · cloudops-wstevens · commit b145a7d140a2 · 2014-09-05T10:06:25.000-04:00
diff --git 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 SslCertResponse createCertResponse(SslCertVO cert, List<LoadBalancerCertM
         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());
         }
