apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CID-1249801 This should be a string comparison, not an object comparison

Browse Source 
(cherry picked from commit ab980cd3b7ae6ada38f7867bdaf3e44b45b6de2f)

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
Hugo Trippaers 2014-10-29 09:24:19 +01:00 committed by Rohit Yadav
parent c25263ba81
commit 744c20bd7c
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
View File

@ -218,7 +218,7 @@ public class LibvirtVMDef {
}
if (hyperVEnlightenmentFeatureDef != null) {
String hpervF = hyperVEnlightenmentFeatureDef.toString();
if (hpervF != "") {
if (!hpervF.isEmpty()) {
feaBuilder.append(hpervF);
}
}
@ -583,7 +583,7 @@ public class LibvirtVMDef {
}
public void defNetworkBasedDisk(String diskName, String sourceHost, int sourcePort, String authUserName, String authSecretUUID, int devId, diskBus bus,
diskProtocol protocol, diskFmtType diskFmtType) {
diskProtocol protocol, diskFmtType diskFmtType) {
_diskType = diskType.NETWORK;
_deviceType = deviceType.DISK;
_diskFmtType = diskFmtType;
@ -599,7 +599,7 @@ public class LibvirtVMDef {
}
public void defNetworkBasedDisk(String diskName, String sourceHost, int sourcePort, String authUserName, String authSecretUUID, String diskLabel, diskBus bus,
diskProtocol protocol, diskFmtType diskFmtType) {
diskProtocol protocol, diskFmtType diskFmtType) {
_diskType = diskType.NETWORK;
_deviceType = deviceType.DISK;
_diskFmtType = diskFmtType;
@ -745,10 +745,10 @@ public class LibvirtVMDef {
diskBuilder.append("/>\n");
if ((_deviceType != deviceType.CDROM) &&
(s_libvirtVersion >= 9008) &&
(s_qemuVersion >= 1001000) &&
(((_bytesReadRate != null) && (_bytesReadRate > 0)) || ((_bytesWriteRate != null) && (_bytesWriteRate > 0)) ||
((_iopsReadRate != null) && (_iopsReadRate > 0)) || ((_iopsWriteRate != null) && (_iopsWriteRate > 0)))) { // not CDROM, from libvirt 0.9.8 and QEMU 1.1.0
(s_libvirtVersion >= 9008) &&
(s_qemuVersion >= 1001000) &&
(((_bytesReadRate != null) && (_bytesReadRate > 0)) || ((_bytesWriteRate != null) && (_bytesWriteRate > 0)) ||
((_iopsReadRate != null) && (_iopsReadRate > 0)) || ((_iopsWriteRate != null) && (_iopsWriteRate > 0)))) { // not CDROM, from libvirt 0.9.8 and QEMU 1.1.0
diskBuilder.append("<iotune>\n");
if ((_bytesReadRate != null) && (_bytesReadRate > 0))
diskBuilder.append("<read_bytes_sec>" + _bytesReadRate + "</read_bytes_sec>\n");
@ -800,9 +800,9 @@ public class LibvirtVMDef {
}
private guestNetType _netType; /*
* bridge, ethernet, network, user,
* internal
*/
* bridge, ethernet, network, user,
* internal
*/
private hostNicType _hostNetType; /* Only used by agent java code */
private String _netSourceMode;
private String _sourceName;