From 2fca9d0a49ff1747256537b49baafd1d991ef41b Mon Sep 17 00:00:00 2001
From: alena <alena@cloud.com>
Date: Wed, 6 Jul 2011 14:21:38 -0700
Subject: [PATCH] bug 10603: fixed NPE in listTemplates status 10603: resolved
 fixed

---
 server/src/com/cloud/api/ApiResponseHelper.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java
index d3ffa7705fb..25b7d7140da 100755
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -1304,7 +1304,7 @@ public class ApiResponseHelper implements ResponseGenerator {
     @Override
     public List<TemplateResponse> createTemplateResponses(long templateId, Long zoneId, boolean readyOnly) {
         List<DataCenterVO> dcs = new ArrayList<DataCenterVO>();
-        if (zoneId == -1) {
+        if (zoneId == null || zoneId == -1) {
             dcs.addAll(ApiDBUtils.listZones());
             List<TemplateResponse> response = new ArrayList<TemplateResponse>();
             for (DataCenterVO dc : dcs ) {