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

Fix potential nullpointer in recent KVM systemvm patchdisk update

Browse Source 
Signed-off-by: Edison Su <sudison@gmail.com>
This commit is contained in:
Marcus Sorensen 2012-09-14 15:26:29 -07:00 committed by Edison Su
parent 0d3a2a3678
commit f52d37fb53
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
View File

@ -2587,7 +2587,8 @@ public class LibvirtComputingResource extends ServerResourceBase implements
if (disk.getDeviceType() == DiskDef.deviceType.CDROM if (disk.getDeviceType() == DiskDef.deviceType.CDROM
&& disk.getDiskPath() != null) { && disk.getDiskPath() != null) {
cleanupDisk(conn, disk); cleanupDisk(conn, disk);
} else if (disk.getDiskPath().contains(vmName + "-patchdisk") } else if (disk.getDiskPath() != null
&& disk.getDiskPath().contains(vmName + "-patchdisk")
&& vmName.matches("^[rsv]-\\d+-VM$")) { && vmName.matches("^[rsv]-\\d+-VM$")) {
if (!_storagePoolMgr.deleteVbdByPath(disk.getDiskPath())) { if (!_storagePoolMgr.deleteVbdByPath(disk.getDiskPath())) {
s_logger.warn("failed to delete patch disk " + disk.getDiskPath()); s_logger.warn("failed to delete patch disk " + disk.getDiskPath());