Repository: cloudstack Updated Branches: refs/heads/4.4-forward cadefb1ae -> 84135cd30
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/84135cd3 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/84135cd3 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/84135cd3 Branch: refs/heads/4.4-forward Commit: 84135cd302ab5fb944a28e73b394d02a8d1c17e2 Parents: cadefb1 Author: Saksham Srivastava <[email protected]> Authored: Wed May 7 13:53:43 2014 +0530 Committer: Rajesh Battala <[email protected]> Committed: Thu May 8 11:37:46 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/84135cd3/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 3be0aaa..0ea68b9 100755 --- a/engine/schema/src/com/cloud/service/ServiceOfferingVO.java +++ b/engine/schema/src/com/cloud/service/ServiceOfferingVO.java @@ -173,7 +173,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();
