From 251e88c4015093fad723c13b496065d6434871cc Mon Sep 17 00:00:00 2001
From: Daan Hoogland <daan@onecht.net>
Date: Mon, 5 Jan 2015 15:55:33 +0100
Subject: [PATCH] CID-1261671 added null check

---
 engine/schema/src/com/cloud/domain/dao/DomainDaoImpl.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/engine/schema/src/com/cloud/domain/dao/DomainDaoImpl.java b/engine/schema/src/com/cloud/domain/dao/DomainDaoImpl.java
index 4c4fe86e3c8..223172e0d67 100644
--- a/engine/schema/src/com/cloud/domain/dao/DomainDaoImpl.java
+++ b/engine/schema/src/com/cloud/domain/dao/DomainDaoImpl.java
@@ -150,6 +150,11 @@ public class DomainDaoImpl extends GenericDaoBase<DomainVO, Long> implements Dom
         if (id != null && id.longValue() == Domain.ROOT_DOMAIN) {
             s_logger.error("Can not remove domain " + id + " as it is ROOT domain");
             return false;
+        } else {
+            if(id == null) {
+                s_logger.error("Can not remove domain without id.");
+                return false;
+            }
         }
 
         DomainVO domain = findById(id);