Skip to content

Commit 0d42910

Browse files
committed
kvm-libvirtCR: fix == should be .equals errors
1 parent 0602f46 commit 0d42910

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
@@ -3370,7 +3370,7 @@ public void detachAndAttachConfigDriveISO(final Connect conn, final String vmNam
33703370
List<DiskDef> disks = getDisks(conn, vmName);
33713371
DiskDef configdrive = null;
33723372
for (DiskDef disk : disks) {
3373-
if (disk.getDeviceType() == DiskDef.DeviceType.CDROM && disk.getDiskLabel() == CONFIG_DRIVE_ISO_DISK_LABEL) {
3373+
if (disk.getDeviceType() == DiskDef.DeviceType.CDROM && disk.getDiskLabel().equals(CONFIG_DRIVE_ISO_DISK_LABEL)) {
33743374
configdrive = disk;
33753375
}
33763376
}
@@ -3412,7 +3412,7 @@ public synchronized String attachOrDetachISO(final Connect conn, final String vm
34123412
final List<DiskDef> disks = getDisks(conn, vmName);
34133413
for (final DiskDef disk : disks) {
34143414
if (disk.getDeviceType() == DiskDef.DeviceType.CDROM
3415-
&& (diskSeq == null || disk.getDiskLabel() == iso.getDiskLabel())) {
3415+
&& (diskSeq == null || disk.getDiskLabel().equals(iso.getDiskLabel()))) {
34163416
cleanupDisk(disk);
34173417
}
34183418
}
@@ -3985,7 +3985,7 @@ public String stopVM(final Connect conn, final String vmName, final boolean forc
39853985
return stopVMInternal(conn, vmName, true);
39863986
}
39873987
String ret = stopVMInternal(conn, vmName, false);
3988-
if (ret == Script.ERR_TIMEOUT) {
3988+
if (ret.equals(Script.ERR_TIMEOUT)) {
39893989
ret = stopVMInternal(conn, vmName, true);
39903990
} else if (ret != null) {
39913991
/*

0 commit comments

Comments
 (0)