Repository: cloudstack Updated Branches: refs/heads/4.4 a2d8f6c9c -> 3943e0ba1
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/3943e0ba Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3943e0ba Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3943e0ba Branch: refs/heads/4.4 Commit: 3943e0ba1c6fc343ac928980bb7309c7256b4e8e Parents: a2d8f6c Author: Saksham Srivastava <saksham.srivast...@citrix.com> Authored: Wed May 7 13:53:43 2014 +0530 Committer: Daan Hoogland <d...@onecht.net> Committed: Sun May 11 11:30:33 2014 +0200 ---------------------------------------------------------------------- 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/3943e0ba/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();
