Skip to content

Commit 352909f

Browse files
committed
kvm-libvirtCR: fix == should be .equals errors
1 parent 175eed2 commit 352909f

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3373,7 +3373,7 @@ public void detachAndAttachConfigDriveISO(final Connect conn, final String vmNam
33733373
List<DiskDef> disks = getDisks(conn, vmName);
33743374
DiskDef configdrive = null;
33753375
for (DiskDef disk : disks) {
3376-
if (disk.getDeviceType() == DiskDef.DeviceType.CDROM && disk.getDiskLabel() == CONFIG_DRIVE_ISO_DISK_LABEL) {
3376+
if (disk.getDeviceType() == DiskDef.DeviceType.CDROM && CONFIG_DRIVE_ISO_DISK_LABEL.equals(disk.getDiskLabel())) {
33773377
configdrive = disk;
33783378
}
33793379
}
@@ -3415,7 +3415,7 @@ public synchronized String attachOrDetachISO(final Connect conn, final String vm
34153415
final List<DiskDef> disks = getDisks(conn, vmName);
34163416
for (final DiskDef disk : disks) {
34173417
if (disk.getDeviceType() == DiskDef.DeviceType.CDROM
3418-
&& (diskSeq == null || disk.getDiskLabel() == iso.getDiskLabel())) {
3418+
&& (diskSeq == null || disk.getDiskLabel().equals(iso.getDiskLabel()))) {
34193419
cleanupDisk(disk);
34203420
}
34213421
}
@@ -3991,7 +3991,7 @@ public String stopVM(final Connect conn, final String vmName, final boolean forc
39913991
return stopVMInternal(conn, vmName, true);
39923992
}
39933993
String ret = stopVMInternal(conn, vmName, false);
3994-
if (ret == Script.ERR_TIMEOUT) {
3994+
if (Script.ERR_TIMEOUT.equals(ret)) {
39953995
ret = stopVMInternal(conn, vmName, true);
39963996
} else if (ret != null) {
39973997
/*

0 commit comments

Comments
 (0)