From 0a2eccce7ac3463523c5d15ef1d0d27d05f482f1 Mon Sep 17 00:00:00 2001
From: anthony <anthony@cloud.com>
Date: Tue, 5 Oct 2010 15:42:23 -0700
Subject: [PATCH] bug 6403: template id of volume may be NULL, need to handle
 this

status 6403: resolved fixed
---
 server/src/com/cloud/vm/UserVmManagerImpl.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
index 5ec095d85cc..b24aa1d4436 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -2213,8 +2213,8 @@ public class UserVmManagerImpl implements UserVmManager {
                 
                 String origTemplateInstallPath = null;
 
-                
-                if (ImageFormat.ISO != _snapshotMgr.getImageFormat(volumeId)) {
+                ImageFormat format =  _snapshotMgr.getImageFormat(volumeId);
+                if (format != null && format != ImageFormat.ISO) {
                     Long origTemplateId = volume.getTemplateId();
                     VMTemplateHostVO vmTemplateHostVO = _templateHostDao.findByHostTemplate(secondaryStorageHost.getId(), origTemplateId);
                     origTemplateInstallPath = vmTemplateHostVO.getInstallPath();