Updated Branches: refs/heads/master-6-17-stable 661e32b3e -> b59bb25f4
CLOUDSTACK-3260 Fixing NPE. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b59bb25f Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b59bb25f Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b59bb25f Branch: refs/heads/master-6-17-stable Commit: b59bb25f4940c733b9ff4f2f16df639425b93b2e Parents: 661e32b Author: Sateesh Chodapuneedi <[email protected]> Authored: Sun Jun 30 08:10:11 2013 +0530 Committer: Sateesh Chodapuneedi <[email protected]> Committed: Sun Jun 30 08:10:11 2013 +0530 ---------------------------------------------------------------------- vmware-base/src/com/cloud/hypervisor/vmware/mo/DatastoreMO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b59bb25f/vmware-base/src/com/cloud/hypervisor/vmware/mo/DatastoreMO.java ---------------------------------------------------------------------- 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 49b9861..a1f2506 100755 --- a/vmware-base/src/com/cloud/hypervisor/vmware/mo/DatastoreMO.java +++ b/vmware-base/src/com/cloud/hypervisor/vmware/mo/DatastoreMO.java @@ -335,7 +335,7 @@ public class DatastoreMO extends BaseMO { HostDatastoreBrowserMO browserMo = getHostDatastoreBrowserMO(); 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."); } for (HostDatastoreBrowserSearchResults result : results) {
