diff --git a/server/src/com/cloud/template/TemplateManagerImpl.java b/server/src/com/cloud/template/TemplateManagerImpl.java index b39936f4ffc..c15bd6b4b7f 100755 --- a/server/src/com/cloud/template/TemplateManagerImpl.java +++ b/server/src/com/cloud/template/TemplateManagerImpl.java @@ -1199,6 +1199,10 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager, // convert projectIds to accountNames if (projectIds != null) { + // CS-17842, initialize accountNames list + if (accountNames == null ){ + accountNames = new ArrayList(); + } for (Long projectId : projectIds) { Project project = _projectMgr.getProject(projectId); if (project == null) {