cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [1/3] git commit: updated refs/heads/master to d63c74a
Date Wed, 21 Dec 2016 18:47:07 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 61073ea51 -> d63c74a7d


CLOUDSTACK-9688: Fix failing smoke tests

Fixes failing smoke tests due to enviroment issues or corner cases:
- Fixes NPE in Template Manager

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6f98fcd3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6f98fcd3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6f98fcd3

Branch: refs/heads/master
Commit: 6f98fcd3a5b1b498a9c1f53e85522282b1cc2b28
Parents: 5e19e64
Author: Rohit Yadav <rohit.yadav@shapeblue.com>
Authored: Wed Dec 21 11:45:20 2016 +0530
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Wed Dec 21 11:45:20 2016 +0530

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6f98fcd3/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 ae1a649..7130042 100644
--- a/server/src/com/cloud/template/TemplateManagerImpl.java
+++ b/server/src/com/cloud/template/TemplateManagerImpl.java
@@ -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());
                 }
             }


Mime
View raw message