apply suggestions

Author: weizhouapache

server/src/main/java/com/cloud/vm/UserVmManagerImpl.java

@@ -9508,13 +9508,16 @@ public UserVm importVM(final DataCenter zone, final Host host, final VirtualMach
             if (host == null && hypervisorType == HypervisorType.VMware) {
                 throw new InvalidParameterValueException("Unable to import virtual machine with invalid host");
             }
+            if (template == null) {
+                throw new InvalidParameterValueException("Unable to import virtual machine without a template");
+            }
 
             // Ensure template details are loaded so that commitUserVm can copy them into the VM's details map
-            VMTemplateVO vmTemplateVO = null;
-            if (template != null) {
-                vmTemplateVO = _templateDao.findById(template.getId());
-                _templateDao.loadDetails(vmTemplateVO);
+            VMTemplateVO vmTemplateVO = _templateDao.findById(template.getId());
+            if (vmTemplateVO == null) {
+                throw new InvalidParameterValueException("Unable to find template with id " + template.getId() + " for virtual machine import");
             }
+            _templateDao.loadDetails(vmTemplateVO);
 
             final long id = _vmDao.getNextInSequence(Long.class, "id");
             String instanceName = StringUtils.isBlank(instanceNameInternal) ?
@@ -9531,7 +9534,7 @@ public UserVm importVM(final DataCenter zone, final Host host, final VirtualMach
             final Boolean dynamicScalingEnabled = checkIfDynamicScalingCanBeEnabled(null, serviceOffering, vmTemplateVO, zone.getId());
             return commitUserVm(true, zone, host, lastHost, vmTemplateVO, hostName, displayName, owner,
                     null, null, userData, null, null, isDisplayVm, keyboard,
-                    accountId, userId, serviceOffering, vmTemplateVO.getFormat().equals(ImageFormat.ISO), sshPublicKeys, networkNicMap,
+                    accountId, userId, serviceOffering, template.getFormat().equals(ImageFormat.ISO), sshPublicKeys, networkNicMap,
                     id, instanceName, uuidName, hypervisorType, customParameters,
                     null, null, null, powerState, dynamicScalingEnabled, null, serviceOffering.getDiskOfferingId(), null, null, null, null);
         });