Merge pull request #810 from jschoiRR/europa-2026

[Mold Europa] 2026.04.15 일자 diplo-> europa 최신 소스 병합 후 빌드 오류 수정

Author: jschoiRR

server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java

@@ -975,36 +975,6 @@ protected void sendExceededBackupLimitAlert(String ownerUuid, Resource.ResourceT
                 message, message + " Please, use the 'updateResourceLimit' API to increase the backup limit.");
     }
 
-    public List<BackupSchedule> listBackupSchedules(ListBackupScheduleCmd cmd) {
-        Account caller = CallContext.current().getCallingAccount();
-        Long id = cmd.getId();
-        Long vmId = cmd.getVmId();
-
-        if (vmId != null) {
-            final VMInstanceVO vm = findVmById(vmId);
-            validateBackupForZone(vm.getDataCenterId());
-            accountManager.checkAccess(CallContext.current().getCallingAccount(), null, true, vm);
-        }
-
-        Filter searchFilter = new Filter(BackupScheduleVO.class, "id", true, null, null);
-        SearchBuilder<BackupScheduleVO> searchBuilder = backupScheduleDao.createSearchBuilder();
-        searchBuilder.and("id", searchBuilder.entity().getId(), SearchCriteria.Op.EQ);
-        if (vmId != null) {
-            searchBuilder.and("vmId", searchBuilder.entity().getVmId(), SearchCriteria.Op.EQ);
-        }
-
-        SearchCriteria<BackupScheduleVO> sc = searchBuilder.create();
-        if (id != null) {
-            sc.setParameters("id", id);
-        }
-        if (vmId != null) {
-            sc.setParameters("vmId", vmId);
-        }
-
-        Pair<List<BackupScheduleVO>, Integer> result = backupScheduleDao.searchAndCount(sc, searchFilter);
-        return new ArrayList<>(result.first());
-    }
-
     /**
      * Gets the backup schedule ID from the async job's payload.
      *

server/src/main/java/org/apache/cloudstack/vm/ImportVmTasksManagerImpl.java

@@ -379,7 +379,7 @@ private void updateTaskDescriptionWithV2KStatus(ImportVMTaskResponse response, I
     }
 
     private void cleanupAblestackV2KDomain(ImportVMTaskVO task) {
-        if (task == null || task.getConvertHostId() == null || StringUtils.isBlank(task.getSourceVMName())) {
+        if (task == null || task.getConvertHostId() <= 0 || StringUtils.isBlank(task.getSourceVMName())) {
             return;
         }
         HostVO convertHost = hostDao.findById(task.getConvertHostId());

server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java

@@ -3958,7 +3958,7 @@ protected void cleanupAblestackV2KDomain(ImportVMTaskVO task, HostVO convertHost
     }
 
     protected void cleanupAblestackV2KDomain(ImportVMTaskVO task) {
-        if (task == null || task.getConvertHostId() == null) {
+        if (task == null || task.getConvertHostId() <= 0) {
             return;
         }
         HostVO convertHost = hostDao.findById(task.getConvertHostId());

ui/src/main.js

@@ -127,4 +127,4 @@ fetch('config.json?ts=' + Date.now())
     })
   }).catch(error => {
     renderError(error)
-  })
+  })