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 EA693108C9 for ; Wed, 3 Jul 2013 13:02:16 +0000 (UTC) Received: (qmail 11068 invoked by uid 500); 3 Jul 2013 13:02:16 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 11047 invoked by uid 500); 3 Jul 2013 13:02:16 -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 11040 invoked by uid 99); 3 Jul 2013 13:02:15 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Jul 2013 13:02:15 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 0ABE3559AF; Wed, 3 Jul 2013 13:02:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: hugo@apache.org To: commits@cloudstack.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to 4e823e3 Date: Wed, 3 Jul 2013 13:02:15 +0000 (UTC) Updated Branches: refs/heads/master 5396dfa55 -> 4e823e3a3 Workaround for NPE Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4e823e3a Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4e823e3a Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4e823e3a Branch: refs/heads/master Commit: 4e823e3a3e0c571de10e2675107da52fbc0b9eff Parents: 5396dfa Author: Hugo Trippaers Authored: Wed Jul 3 09:58:12 2013 +0200 Committer: Hugo Trippaers Committed: Wed Jul 3 14:59:03 2013 +0200 ---------------------------------------------------------------------- server/src/com/cloud/storage/StorageManagerImpl.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4e823e3a/server/src/com/cloud/storage/StorageManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java index 6499e49..9ddcb78 100755 --- a/server/src/com/cloud/storage/StorageManagerImpl.java +++ b/server/src/com/cloud/storage/StorageManagerImpl.java @@ -1522,7 +1522,13 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager, C } long futureIops = currentIops + requestedIops; - + + // getCapacityIops returns a Long so we need to check for null + if (pool.getCapacityIops() == null) { + s_logger.warn("Storage pool " + pool.getName() + " (" + pool.getId() + ") does not supply Iops capacity, assuming enough capacity"); + return true; + } + return futureIops <= pool.getCapacityIops(); }