From 9aa1743984de30eb96e8a3fad9690f4d73bc255e Mon Sep 17 00:00:00 2001 From: Nicolas Vazquez Date: Mon, 21 May 2018 03:56:31 -0300 Subject: [PATCH] registerIso: Fixes #2654 register iso in all zones (#2652) Fix to register of iso in all zones. Fixes #2654. --- server/src/com/cloud/template/TemplateAdapterBase.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/src/com/cloud/template/TemplateAdapterBase.java b/server/src/com/cloud/template/TemplateAdapterBase.java index 7467e30aa01..e7f21b15abe 100644 --- a/server/src/com/cloud/template/TemplateAdapterBase.java +++ b/server/src/com/cloud/template/TemplateAdapterBase.java @@ -24,6 +24,7 @@ import java.util.Map; import javax.inject.Inject; import org.apache.cloudstack.api.command.user.template.GetUploadParamsForTemplateCmd; +import org.apache.commons.collections.CollectionUtils; import org.apache.log4j.Logger; import org.apache.cloudstack.api.ApiConstants; @@ -325,7 +326,7 @@ public abstract class TemplateAdapterBase extends AdapterBase implements Templat Long zoneId = cmd.getZoneId(); // ignore passed zoneId if we are using region wide image store List stores = _imgStoreDao.findRegionImageStores(); - if (!(stores != null && stores.size() > 0)) { + if (CollectionUtils.isEmpty(stores) && zoneId != null && zoneId > 0L) { zoneList = new ArrayList<>(); zoneList.add(zoneId); }