rafaelweingartner commented on a change in pull request #2652: Fix register iso
in all zones
URL: https://github.com/apache/cloudstack/pull/2652#discussion_r189040177
##########
File path: server/src/com/cloud/template/TemplateAdapterBase.java
##########
@@ -325,7 +325,7 @@ public TemplateProfile prepare(RegisterIsoCmd cmd) throws
ResourceAllocationExce
Long zoneId = cmd.getZoneId();
// ignore passed zoneId if we are using region wide image store
List<ImageStoreVO> stores = _imgStoreDao.findRegionImageStores();
- if (!(stores != null && stores.size() > 0)) {
+ if (!(stores != null && stores.size() > 0) && zoneId != null && zoneId
> 0L) {
Review comment:
@nvazquez would you mind changing `!(stores != null && stores.size()` to
`CollectionUtils.isEmpty`?
That clause is quite confusing, and at the end of the day, it is checking if
the list `stores ` is empty.
Then, you can have the following:
`if (CollectionUtils.isEmpty(stores) && zoneId != null && zoneId > 0L)`
It makes the IF condition easier to read.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
