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 5E20911CCB for ; Sun, 24 Aug 2014 14:04:22 +0000 (UTC) Received: (qmail 96823 invoked by uid 500); 24 Aug 2014 14:04:22 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 96797 invoked by uid 500); 24 Aug 2014 14:04:22 -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 96788 invoked by uid 99); 24 Aug 2014 14:04:22 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 24 Aug 2014 14:04:22 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id AB305955CAB; Sun, 24 Aug 2014 14:04:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bhaisaab@apache.org To: commits@cloudstack.apache.org Date: Sun, 24 Aug 2014 14:04:21 -0000 Message-Id: <585a1505e501427b9b78fa468ab4ac2c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [01/50] [abbrv] git commit: updated refs/heads/saml2 to ba68616 Repository: cloudstack Updated Branches: refs/heads/saml2 54986d58a -> ba68616f9 (forced update) kvm: Throw a proper exception when pool could not be fetched from libvirt Otherwise NULL is returned and leads to a NPE further up the chain. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1ed0fe4e Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1ed0fe4e Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1ed0fe4e Branch: refs/heads/saml2 Commit: 1ed0fe4ee710d33bdb5c14704bc40de01f49d540 Parents: 14f3ad5 Author: Wido den Hollander Authored: Wed Aug 20 13:39:52 2014 +0200 Committer: Wido den Hollander Committed: Wed Aug 20 13:39:52 2014 +0200 ---------------------------------------------------------------------- .../com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1ed0fe4e/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java index 1d28804..f44bb03 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java @@ -204,6 +204,8 @@ public class KVMStoragePoolManager { StoragePoolInformation info = _storagePools.get(uuid); if (info != null) { pool = createStoragePool(info.name, info.host, info.port, info.path, info.userInfo, info.poolType, info.type); + } else { + throw new CloudRuntimeException("Could not fetch storage pool " + uuid + " from libvirt"); } } return pool;