[cloudstack] branch main updated: server: fix apache/4.18 merge failure

[shwstppr]

This is an automated email from the ASF dual-hosted git repository.

shwstppr pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/main by this push:
     new c944727d338 server: fix apache/4.18 merge failure
c944727d338 is described below

commit c944727d338c34cd2c6ce0c587a96d0200fb8454
Author: Abhishek Kumar <abhishek.mr...@gmail.com>
AuthorDate: Tue Jun 6 13:26:06 2023 +0530

    server: fix apache/4.18 merge failure
    
    Signed-off-by: Abhishek Kumar <abhishek.mr...@gmail.com>
---
 server/src/main/java/com/cloud/storage/StorageManagerImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/main/java/com/cloud/storage/StorageManagerImpl.java 
b/server/src/main/java/com/cloud/storage/StorageManagerImpl.java
index 83408828d5a..5b1ca905872 100644
--- a/server/src/main/java/com/cloud/storage/StorageManagerImpl.java
+++ b/server/src/main/java/com/cloud/storage/StorageManagerImpl.java
@@ -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));