Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BA23E17987 for ; Mon, 8 Jun 2015 08:01:36 +0000 (UTC) Received: (qmail 59810 invoked by uid 500); 8 Jun 2015 08:01:36 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 59777 invoked by uid 500); 8 Jun 2015 08:01:36 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 59768 invoked by uid 99); 8 Jun 2015 08:01:36 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Jun 2015 08:01:36 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4E6CDDFAFF; Mon, 8 Jun 2015 08:01:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dahn@apache.org To: commits@cloudstack.apache.org Date: Mon, 08 Jun 2015 08:01:36 -0000 Message-Id: <2921508d62054b199744fa82d4f9e93a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/5] git commit: updated refs/heads/master to b272d77 Repository: cloudstack Updated Branches: refs/heads/master 9bac84a3f -> b272d7717 Fix findbugs high priority warning VmwareStorageManagerImpl.java:1023, RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE, Priority: High Redundant nullcheck of datastoreVolumePath, which is known to be non-null in com.cloud.hypervisor.vmware.manager.VmwareStorageManagerImpl.getVolumePathInDatastore(DatastoreMO, String) Assertion is not used in runtime, correct way is throw and handle exception without killing app Signed-off-by: Daan Hoogland This closes #362 Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e8c7069f Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e8c7069f Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e8c7069f Branch: refs/heads/master Commit: e8c7069f734b7886cbe0e8dfec4452a4fdfe20b3 Parents: 9bac84a Author: Rafael da Fonseca Authored: Sun Jun 7 11:38:04 2015 +0200 Committer: Daan Hoogland Committed: Mon Jun 8 09:40:50 2015 +0200 ---------------------------------------------------------------------- .../cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java | 1 - 1 file changed, 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e8c7069f/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java index 3aec7a4..34ede03 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java @@ -1019,7 +1019,6 @@ public class VmwareStorageManagerImpl implements VmwareStorageManager { private String getVolumePathInDatastore(DatastoreMO dsMo, String volumeFileName) throws Exception { String datastoreVolumePath = dsMo.searchFileInSubFolders(volumeFileName, true); - assert (datastoreVolumePath != null) : "Virtual disk file missing from datastore."; if (datastoreVolumePath == null) { throw new CloudRuntimeException("Unable to find file " + volumeFileName + " in datastore " + dsMo.getName()); }