map 형식 null 체크 방식 수정

Author: jschoiRR

engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java

@@ -511,7 +511,7 @@ public void allocate(final String vmInstanceName, final VirtualMachineTemplate t
 
             logger.debug("Allocating disks for {}",  persistedVm);
 
-            if (!customParameters.isEmpty() && customParameters.containsKey("volumeId")){
+            if (!MapUtils.isEmpty(customParameters) && customParameters.containsKey("volumeId")){
                 VolumeVO volVO =_volsDao.findById(Long.parseLong(customParameters.get("volumeId")));
                 volVO.setInstanceId(vm.getId());
                 _volsDao.update(volVO.getId(), volVO);

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

@@ -16,6 +16,7 @@
 // under the License.
 package com.cloud.vm;
 
+import static com.cloud.configuration.ConfigurationManager.VM_USERDATA_MAX_LENGTH;
 import static com.cloud.configuration.ConfigurationManagerImpl.VM_USERDATA_MAX_LENGTH;
 import static com.cloud.storage.Volume.IOPS_LIMIT;
 import static com.cloud.utils.NumbersUtil.toHumanReadableSize;
@@ -3992,7 +3993,7 @@ private UserVm createVirtualMachine(DataCenter zone, ServiceOffering serviceOffe
             throw new PermissionDeniedException("The owner of vm to deploy is disabled: " + owner);
         }
         VMTemplateVO template = _templateDao.findById(tmplt.getId());
-        if (!customParameters.isEmpty() && customParameters.containsKey("volumeId")){
+        if (!MapUtils.isEmpty(customParameters) && customParameters.containsKey("volumeId")){
             template = _templateDao.findByIdIncludingRemoved(tmplt.getId());
         }
 
@@ -4074,7 +4075,7 @@ private UserVm createVirtualMachine(DataCenter zone, ServiceOffering serviceOffe
             throw new InvalidParameterValueException("Root volume encryption is not supported for hypervisor type " + hypervisorType);
         }
 
-        if (!customParameters.isEmpty() && customParameters.containsKey("volumeId")){
+        if (!MapUtils.isEmpty(customParameters) && customParameters.containsKey("volumeId")){
             Long volumeId = Long.valueOf(customParameters.get("volumeId"));
             VolumeVO volume = _volsDao.findById(volumeId);
             // Compute the size of the volume
@@ -4498,7 +4499,7 @@ protected long configureCustomRootDiskSize(Map<String, String> customParameters,
             _volumeService.validateVolumeSizeInBytes(rootDiskSize);
             return rootDiskSize;
         } else {
-            if (!customParameters.isEmpty() && !customParameters.containsKey("volumeId")){
+            if (!MapUtils.isEmpty(customParameters) && !customParameters.containsKey("volumeId")){
                 // For baremetal, size can be 0 (zero)
                 Long templateSize = _templateDao.findById(template.getId()).getSize();
                 if (templateSize != null) {
@@ -4562,7 +4563,7 @@ private UserVmVO commitUserVm(final boolean isImport, final DataCenter zone, fin
                 offering.getLimitCpuUse(), owner.getDomainId(), owner.getId(), userId, offering.getId(), userData, userDataId, userDataDetails, hostName);
         vm.setUuid(uuidName);
         vm.setDynamicallyScalable(dynamicScalingEnabled);
-        if (!customParameters.isEmpty() && customParameters.containsKey("volumeId")){
+        if (!MapUtils.isEmpty(customParameters) && customParameters.containsKey("volumeId")){
             template = _templateDao.findByIdIncludingRemoved(template.getId());
         }
         Map<String, String> details = template.getDetails();