apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Findbugs finding: Fix potential NPE

Browse Source
This commit is contained in:
Hugo Trippaers 2014-01-23 14:44:02 +00:00
parent e668c3f4e5
commit 86df2c1f80
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,6 +32,7 @@ import com.vmware.vim25.PropertySpec;
import com.vmware.vim25.SelectionSpec; import com.vmware.vim25.SelectionSpec;
import com.vmware.vim25.TraversalSpec; import com.vmware.vim25.TraversalSpec;
import com.cloud.exception.CloudException;
import com.cloud.hypervisor.vmware.util.VmwareContext; import com.cloud.hypervisor.vmware.util.VmwareContext;
import com.cloud.utils.Pair; 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, 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(); String srcDsName = getName();
DatastoreMO destDsMo = new DatastoreMO(_context, morDestDs); 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, 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(); String srcDsName = getName();
DatastoreMO destDsMo = new DatastoreMO(_context, morDestDs); DatastoreMO destDsMo = new DatastoreMO(_context, morDestDs);
@ -342,6 +343,10 @@ public class DatastoreMO extends BaseMO {
ArrayList<HostDatastoreBrowserSearchResults> results = browserMo.searchDatastoreSubFolders("[" + getName() + "]", fileName, caseInsensitive); ArrayList<HostDatastoreBrowserSearchResults> results = browserMo.searchDatastoreSubFolders("[" + getName() + "]", fileName, caseInsensitive);
if (results != null && results.size() > 1) { 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."); 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) { for (HostDatastoreBrowserSearchResults result : results) {
List<FileInfo> info = result.getFile(); List<FileInfo> info = result.getFile();