You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ha...@apache.org on 2022/12/30 07:46:33 UTC
[cloudstack] 03/07: Some static analysis fixes
This is an automated email from the ASF dual-hosted git repository.
harikrishna pushed a commit to branch guest-os-mappings-improvements
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 6833b48a7a4600fce1e0c62bcfc815368cf1ea90
Author: Suresh Kumar Anaparti <su...@gmail.com>
AuthorDate: Thu Jul 28 17:17:29 2022 +0530
Some static analysis fixes
---
.../wrapper/xenbase/CitrixCheckGuestOsMappingCommandWrapper.java | 2 +-
.../wrapper/xenbase/CitrixGetHypervisorGuestOsNamesCommandWrapper.java | 2 +-
server/src/main/java/com/cloud/server/ManagementServerImpl.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCheckGuestOsMappingCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCheckGuestOsMappingCommandWrapper.java
index da3087cab91..a87ce1df997 100644
--- a/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCheckGuestOsMappingCommandWrapper.java
+++ b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCheckGuestOsMappingCommandWrapper.java
@@ -45,7 +45,7 @@ public final class CitrixCheckGuestOsMappingCommandWrapper extends CommandWrappe
try {
s_logger.info("Checking guest os mapping name: " + guestOsMappingName + " for the guest os: " + guestOsName + " in the hypervisor");
final Set<VM> vms = VM.getAll(conn);
- if (vms.size() == 0) {
+ if (vms == null || vms.isEmpty()) {
return new CheckGuestOsMappingAnswer(command, "Unable to match guest os mapping name: " + guestOsMappingName + " in the hypervisor");
}
for (VM vm : vms) {
diff --git a/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetHypervisorGuestOsNamesCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetHypervisorGuestOsNamesCommandWrapper.java
index 73cecebe00d..477b5363218 100644
--- a/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetHypervisorGuestOsNamesCommandWrapper.java
+++ b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetHypervisorGuestOsNamesCommandWrapper.java
@@ -48,7 +48,7 @@ public final class CitrixGetHypervisorGuestOsNamesCommandWrapper extends Command
try {
s_logger.info("Getting guest os names in the hypervisor");
final Set<VM> vms = VM.getAll(conn);
- if (vms.size() == 0) {
+ if (vms == null || vms.isEmpty()) {
return new GetHypervisorGuestOsNamesAnswer(command, "Guest os names not found in the hypervisor");
}
List<Pair<String, String>> hypervisorGuestOsNames = new ArrayList<>();
diff --git a/server/src/main/java/com/cloud/server/ManagementServerImpl.java b/server/src/main/java/com/cloud/server/ManagementServerImpl.java
index 5eb0ea18325..a36fb654b5c 100644
--- a/server/src/main/java/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/main/java/com/cloud/server/ManagementServerImpl.java
@@ -2748,7 +2748,7 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
}
GetHypervisorGuestOsNamesAnswer answer = (GetHypervisorGuestOsNamesAnswer) _agentMgr.easySend(host.getId(), new GetHypervisorGuestOsNamesCommand(getHypervisorGuestOsNamesCmd.getKeyword()));
if (answer == null || !answer.getResult()) {
- throw new CloudRuntimeException(String.format("Unable to get guest os names for %s, hypervisor: %s, version: %s", hypervisorType.toString(), getHypervisorGuestOsNamesCmd.getHypervisorVersion()));
+ throw new CloudRuntimeException(String.format("Unable to get guest os names for hypervisor: %s, version: %s", hypervisorType.toString(), getHypervisorGuestOsNamesCmd.getHypervisorVersion()));
}
return answer.getHypervisorGuestOsNames();
}