Updated Branches: refs/heads/object_store 3bf15bd1f -> ec55c2e90
CS-17842: java.lang.NullPointerException seen when using "updateTemplatePermission" with projectids parameter. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ec55c2e9 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ec55c2e9 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ec55c2e9 Branch: refs/heads/object_store Commit: ec55c2e909790c2320a3b5658b7031a5fe0416f7 Parents: 3bf15bd Author: Min Chen <min.c...@citrix.com> Authored: Tue Jun 11 17:07:26 2013 -0700 Committer: Min Chen <min.c...@citrix.com> Committed: Tue Jun 11 17:07:26 2013 -0700 ---------------------------------------------------------------------- server/src/com/cloud/template/TemplateManagerImpl.java | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec55c2e9/server/src/com/cloud/template/TemplateManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/template/TemplateManagerImpl.java b/server/src/com/cloud/template/TemplateManagerImpl.java index b39936f..c15bd6b 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<String>(); + } for (Long projectId : projectIds) { Project project = _projectMgr.getProject(projectId); if (project == null) {
