apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1846 from shapeblue/49smoketest-fixes

Browse Source 
CLOUDSTACK-9688: Fix failing smoke testsFixes failing smoke tests due to enviroment issues or corner cases:
- Fixes NPE in Template Manager

@blueorangutan package

* pr/1846:
  CLOUDSTACK-9688: Fix failing smoke tests

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
Rohit Yadav 2016-12-22 00:16:21 +05:30
commit f68b6e8312
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/com/cloud/template/TemplateManagerImpl.java
View File

@ -1740,7 +1740,7 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager,
if (sourceTemplateId != null) {
VMTemplateVO sourceTemplate = _tmpltDao.findById(sourceTemplateId);
if(sourceTemplate != null){
if (sourceTemplate != null && sourceTemplate.getDetails() != null) {
details.putAll(sourceTemplate.getDetails());
}
}