From 6f98fcd3a5b1b498a9c1f53e85522282b1cc2b28 Mon Sep 17 00:00:00 2001
From: Rohit Yadav <rohit.yadav@shapeblue.com>
Date: Wed, 21 Dec 2016 11:45:20 +0530
Subject: [PATCH] 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>
---
 server/src/com/cloud/template/TemplateManagerImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/com/cloud/template/TemplateManagerImpl.java b/server/src/com/cloud/template/TemplateManagerImpl.java
index ae1a64905c5..7130042bc5c 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());
                 }
             }