You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mt...@apache.org on 2014/06/27 22:05:05 UTC
git commit: updated refs/heads/master to afd4881
Repository: cloudstack
Updated Branches:
refs/heads/master 190116c94 -> afd48819a
Fixing an issue introduced with Review Request 22717
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/afd48819
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/afd48819
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/afd48819
Branch: refs/heads/master
Commit: afd48819a6c65640892e35a1b34a90df95605792
Parents: 190116c
Author: Mike Tutkowski <mi...@solidfire.com>
Authored: Fri Jun 27 14:03:08 2014 -0600
Committer: Mike Tutkowski <mi...@solidfire.com>
Committed: Fri Jun 27 14:03:08 2014 -0600
----------------------------------------------------------------------
server/src/com/cloud/capacity/CapacityManagerImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/afd48819/server/src/com/cloud/capacity/CapacityManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/capacity/CapacityManagerImpl.java b/server/src/com/cloud/capacity/CapacityManagerImpl.java
index e57604e..8f2a2b2 100755
--- a/server/src/com/cloud/capacity/CapacityManagerImpl.java
+++ b/server/src/com/cloud/capacity/CapacityManagerImpl.java
@@ -550,7 +550,7 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager,
if (volumes != null && volumes.size() > 0) {
for (VolumeVO volume : volumes) {
- usedIops += volume.getMinIops();
+ usedIops += volume.getMinIops() != null ? volume.getMinIops() : 0;
}
}