You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2014/05/08 08:43:15 UTC
git commit: updated refs/heads/master to b8adb96
Repository: cloudstack
Updated Branches:
refs/heads/master b7b89b129 -> b8adb96ae
CLOUDSTACK-6575: Deploy VM failed with NPE while using custom compute offering
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b8adb96a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b8adb96a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b8adb96a
Branch: refs/heads/master
Commit: b8adb96ae1d1ce0066ce8c937fa0e15434c4acc4
Parents: b7b89b1
Author: Saksham Srivastava <sa...@citrix.com>
Authored: Wed May 7 13:53:43 2014 +0530
Committer: Rajesh Battala <ra...@citrix.com>
Committed: Thu May 8 12:16:28 2014 +0530
----------------------------------------------------------------------
engine/schema/src/com/cloud/service/ServiceOfferingVO.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b8adb96a/engine/schema/src/com/cloud/service/ServiceOfferingVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/service/ServiceOfferingVO.java b/engine/schema/src/com/cloud/service/ServiceOfferingVO.java
index 8d03bf4..df68fb8 100755
--- a/engine/schema/src/com/cloud/service/ServiceOfferingVO.java
+++ b/engine/schema/src/com/cloud/service/ServiceOfferingVO.java
@@ -176,7 +176,7 @@ public class ServiceOfferingVO extends DiskOfferingVO implements ServiceOffering
offering.getUseLocalStorage(),
offering.getSystemUse(),
true,
- offering.isCustomizedIops(),
+ offering.isCustomizedIops()== null ? false:offering.isCustomizedIops(),
offering.getDomainId());
cpu = offering.getCpu();
ramSize = offering.getRamSize();