gitqueue
diff --git a/‎vmware-base/src/com/cloud/hypervisor/vmware/mo/DatastoreMO.java‎
Lines changed: 7 additions & 2 deletions b/‎vmware-base/src/com/cloud/hypervisor/vmware/mo/DatastoreMO.java‎
Lines changed: 7 additions & 2 deletions
@@ -32,6 +32,7 @@
 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 boolean deleteFile(String path, ManagedObjectReference morDc, boolean tes
     }
 
     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 boolean copyDatastoreFile(String srcFilePath, ManagedObjectReference morS
     }
 
     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 String searchFileInSubFolders(String fileName, boolean caseInsensitive) t
         ArrayList<HostDatastoreBrowserSearchResults> 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<FileInfo> info = result.getFile();