From db97bb8e8905feb8e1444fb5136ba893e304670c Mon Sep 17 00:00:00 2001 From: Sheng Yang Date: Fri, 21 Jun 2013 17:15:50 -0700 Subject: [PATCH] Fix NPE when using baremetal template Template size is NULL for baremetal, which caused NPE when unboxing --- server/src/com/cloud/vm/UserVmManagerImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index 7ae96da8b64..7b3b1bc9758 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -2450,7 +2450,12 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Use // check if account/domain is with in resource limits to create a new vm boolean isIso = Storage.ImageFormat.ISO == template.getFormat(); - long size = _templateDao.findById(template.getId()).getSize(); + // For baremetal, size can be null + Long tmp = _templateDao.findById(template.getId()).getSize(); + long size = 0; + if (tmp != null) { + size = tmp; + } if (diskOfferingId != null) { size += _diskOfferingDao.findById(diskOfferingId).getDiskSize(); }