From 4e823e3a3e0c571de10e2675107da52fbc0b9eff Mon Sep 17 00:00:00 2001 From: Hugo Trippaers Date: Wed, 3 Jul 2013 09:58:12 +0200 Subject: [PATCH] Workaround for NPE --- server/src/com/cloud/storage/StorageManagerImpl.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java index 6499e497068..9ddcb7866fd 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(); }