From 86df2c1f8022bbd4417a06aea22693f14b1db733 Mon Sep 17 00:00:00 2001 From: Hugo Trippaers Date: Thu, 23 Jan 2014 14:44:02 +0000 Subject: [PATCH] Findbugs finding: Fix potential NPE --- .../src/com/cloud/hypervisor/vmware/mo/DatastoreMO.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/DatastoreMO.java b/vmware-base/src/com/cloud/hypervisor/vmware/mo/DatastoreMO.java index 21b3026154b..363b91f9c68 100755 --- a/vmware-base/src/com/cloud/hypervisor/vmware/mo/DatastoreMO.java +++ b/vmware-base/src/com/cloud/hypervisor/vmware/mo/DatastoreMO.java @@ -32,6 +32,7 @@ import com.vmware.vim25.PropertySpec; import com.vmware.vim25.SelectionSpec; import com.vmware.vim25.TraversalSpec; +import com.cloud.exception.CloudException; import com.cloud.hypervisor.vmware.util.VmwareContext; import com.cloud.utils.Pair; @@ -181,7 +182,7 @@ public class DatastoreMO extends BaseMO { } public boolean copyDatastoreFile(String srcFilePath, ManagedObjectReference morSrcDc, ManagedObjectReference morDestDs, String destFilePath, - ManagedObjectReference morDestDc, boolean forceOverwrite) throws Exception { + ManagedObjectReference morDestDc, boolean forceOverwrite) throws Exception { String srcDsName = getName(); DatastoreMO destDsMo = new DatastoreMO(_context, morDestDs); @@ -209,7 +210,7 @@ public class DatastoreMO extends BaseMO { } public boolean moveDatastoreFile(String srcFilePath, ManagedObjectReference morSrcDc, ManagedObjectReference morDestDs, String destFilePath, - ManagedObjectReference morDestDc, boolean forceOverwrite) throws Exception { + ManagedObjectReference morDestDc, boolean forceOverwrite) throws Exception { String srcDsName = getName(); DatastoreMO destDsMo = new DatastoreMO(_context, morDestDs); @@ -342,6 +343,10 @@ public class DatastoreMO extends BaseMO { ArrayList results = browserMo.searchDatastoreSubFolders("[" + getName() + "]", fileName, caseInsensitive); if (results != null && results.size() > 1) { s_logger.warn("Multiple files with name " + fileName + " exists in datastore " + datastorePath + ". Trying to choose first file found in search attempt."); + } else if (results == null) { + String msg = "No file found with name " + fileName + " found in datastore " + datastorePath; + s_logger.error(msg); + throw new CloudException(msg); } for (HostDatastoreBrowserSearchResults result : results) { List info = result.getFile();