server: fix apache/4.18 merge failure

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
This commit is contained in:
Abhishek Kumar 2023-06-06 13:26:06 +05:30
parent 6ea5f56e62
commit c944727d33

View File

@ -1484,7 +1484,7 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager, C
if (vm == null) {
return false;
}
List<VolumeVO> vmUsableVolumes = _volumeDao.findUsableVolumesForInstance(vmId);
List<VolumeVO> vmUsableVolumes = volumeDao.findUsableVolumesForInstance(vmId);
for (VolumeVO vol : vmUsableVolumes) {
if (gcVolume.getPoolId().equals(vol.getPoolId()) && gcVolume.getPath().equals(vol.getPath())) {
s_logger.debug(String.format("%s meant for garbage collection could a possible duplicate for %s", gcVolume, vol));