mirror of
https://github.com/apache/cloudstack.git
synced 2025-11-02 20:02:29 +01:00
server: fix apache/4.18 merge failure
Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
This commit is contained in:
parent
6ea5f56e62
commit
c944727d33
@ -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));
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user