weizhouapache commented on a change in pull request #5170: URL: https://github.com/apache/cloudstack/pull/5170#discussion_r661358650
########## File path: plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java ########## @@ -7501,7 +7501,7 @@ private Answer execute(PrepareUnmanageVMInstanceCommand cmd) { VolumeObjectTO newVol = new VolumeObjectTO(); newVol.setDataStoreUuid(entry.second().getUuid()); String newPath = vmMo.getVmdkFileBaseName(disk); - ManagedObjectReference morDs = HypervisorHostHelper.findDatastoreWithBackwardsCompatibility(targetHyperHost, entry.second().getUuid()); + ManagedObjectReference morDs = HypervisorHostHelper.findDatastoreWithBackwardsCompatibility(targetHyperHost != null ? targetHyperHost : sourceHyperHost, entry.second().getUuid()); Review comment: @shwstppr great, thanks. no idea if it breaks some features. at least the NPE is fixed by this pr. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@cloudstack.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org