etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-3529 Unable to test file existence due to exception java.lang.RuntimeException 

See if file being deleted is directory or file.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
This commit is contained in:
Sateesh Chodapuneedi 2013-07-16 21:30:03 +05:30
parent ea3a77e2af
commit bbd7183df0
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
vmware-base/src/com/cloud/hypervisor/vmware/mo/DatastoreMO.java
View File

@ -21,8 +21,6 @@ import java.util.List;
import org.apache.log4j.Logger;
import com.cloud.hypervisor.vmware.util.VmwareContext;
import com.cloud.utils.Pair;
import com.vmware.vim25.DatastoreSummary;
import com.vmware.vim25.FileInfo;
import com.vmware.vim25.HostDatastoreBrowserSearchResults;
@ -34,6 +32,9 @@ import com.vmware.vim25.PropertySpec;
import com.vmware.vim25.SelectionSpec;
import com.vmware.vim25.TraversalSpec;
import com.cloud.hypervisor.vmware.util.VmwareContext;
import com.cloud.utils.Pair;
public class DatastoreMO extends BaseMO {
private static final Logger s_logger = Logger.getLogger(DatastoreMO.class);
@ -48,7 +49,8 @@ public class DatastoreMO extends BaseMO {
super(context, morType, morValue);
}
public String getName() throws Exception {
@Override
public String getName() throws Exception {
if(_name == null)
_name = (String)_context.getVimClient().getDynamicProperty(_mor, "name");
@ -131,10 +133,15 @@ public class DatastoreMO extends BaseMO {
String fullPath = path;
if(!DatastoreFile.isFullDatastorePath(fullPath))
fullPath = String.format("[%s] %s", datastoreName, path);
DatastoreFile file = new DatastoreFile(fullPath);
// Test if file specified is null or empty. We don't need to attempt to delete and return success.
if (file.getFileName() == null || file.getFileName().isEmpty()) {
return true;
}
try {
if(testExistence && !fileExists(fullPath)) {
String searchResult = searchFileInSubFolders(fullPath.split(" ")[1], true);
String searchResult = searchFileInSubFolders(file.getFileName(), true);
if (searchResult == null) {
return true;
} else {