diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateCommandWrapper.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateCommandWrapper.java index 67ec1b731af..067e77df3cf 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateCommandWrapper.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateCommandWrapper.java @@ -45,6 +45,7 @@ import javax.xml.transform.stream.StreamResult; import org.apache.commons.collections.MapUtils; import org.apache.commons.io.IOUtils; +import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.libvirt.Connect; import org.libvirt.Domain; @@ -332,9 +333,9 @@ public final class LibvirtMigrateCommandWrapper extends CommandWrapper paths, String sourceFileDevText) { - if (paths != null && sourceFileDevText != null) { + private String getPathFromSourceText(Set paths, String sourceText) { + if (paths != null && !StringUtils.isBlank(sourceText)) { for (String path : paths) { - if (sourceFileDevText.contains(path)) { + if (sourceText.contains(path)) { return path; } } @@ -395,7 +396,7 @@ public final class LibvirtMigrateCommandWrapper extends CommandWrapper