cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject git commit: updated refs/heads/master to 251e88c
Date Mon, 05 Jan 2015 14:55:42 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 54e5f28ac -> 251e88c40


CID-1261671 added null check


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/251e88c4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/251e88c4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/251e88c4

Branch: refs/heads/master
Commit: 251e88c4015093fad723c13b496065d6434871cc
Parents: 54e5f28
Author: Daan Hoogland <daan@onecht.net>
Authored: Mon Jan 5 15:55:33 2015 +0100
Committer: Daan Hoogland <daan@onecht.net>
Committed: Mon Jan 5 15:55:33 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/251e88c4/engine/schema/src/com/cloud/domain/dao/DomainDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/domain/dao/DomainDaoImpl.java b/engine/schema/src/com/cloud/domain/dao/DomainDaoImpl.java
index 4c4fe86..223172e 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);


Mime
View raw message