@@ -3384,7 +3384,7 @@ public void detachAndAttachConfigDriveISO(final Connect conn, final String vmNam
33843384 List <DiskDef > disks = getDisks (conn , vmName );
33853385 DiskDef configdrive = null ;
33863386 for (DiskDef disk : disks ) {
3387- if (disk .getDeviceType () == DiskDef .DeviceType .CDROM && disk .getDiskLabel () == CONFIG_DRIVE_ISO_DISK_LABEL ) {
3387+ if (disk .getDeviceType () == DiskDef .DeviceType .CDROM && CONFIG_DRIVE_ISO_DISK_LABEL . equals ( disk .getDiskLabel ()) ) {
33883388 configdrive = disk ;
33893389 }
33903390 }
@@ -3426,7 +3426,7 @@ public synchronized String attachOrDetachISO(final Connect conn, final String vm
34263426 final List <DiskDef > disks = getDisks (conn , vmName );
34273427 for (final DiskDef disk : disks ) {
34283428 if (disk .getDeviceType () == DiskDef .DeviceType .CDROM
3429- && (diskSeq == null || disk .getDiskLabel () == iso .getDiskLabel ())) {
3429+ && (diskSeq == null || disk .getDiskLabel (). equals ( iso .getDiskLabel () ))) {
34303430 cleanupDisk (disk );
34313431 }
34323432 }
@@ -4002,7 +4002,7 @@ public String stopVM(final Connect conn, final String vmName, final boolean forc
40024002 return stopVMInternal (conn , vmName , true );
40034003 }
40044004 String ret = stopVMInternal (conn , vmName , false );
4005- if (ret == Script .ERR_TIMEOUT ) {
4005+ if (Script .ERR_TIMEOUT . equals ( ret ) ) {
40064006 ret = stopVMInternal (conn , vmName , true );
40074007 } else if (ret != null ) {
40084008 /*
0 commit comments