Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id B911C200BE4 for ; Wed, 21 Dec 2016 19:47:08 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id B7BE2160B3A; Wed, 21 Dec 2016 18:47:08 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 0EF62160B18 for ; Wed, 21 Dec 2016 19:47:07 +0100 (CET) Received: (qmail 50625 invoked by uid 500); 21 Dec 2016 18:47:07 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 50610 invoked by uid 99); 21 Dec 2016 18:47:07 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Dec 2016 18:47:07 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 24715DFC15; Wed, 21 Dec 2016 18:47:07 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bhaisaab@apache.org To: commits@cloudstack.apache.org Date: Wed, 21 Dec 2016 18:47:07 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/3] git commit: updated refs/heads/master to d63c74a archived-at: Wed, 21 Dec 2016 18:47:08 -0000 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 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 Authored: Wed Dec 21 11:45:20 2016 +0530 Committer: Rohit Yadav 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()); } }