You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2014/01/30 23:41:06 UTC
[15/50] [abbrv] git commit: updated refs/heads/ui-restyle to 849d601
findbugs: null-checks(cherry picked from commit
c58e509924e97dfced80981da5c27b9f3aae9b33)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/44bc2beb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/44bc2beb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/44bc2beb
Branch: refs/heads/ui-restyle
Commit: 44bc2beb143992b10ad9a92642dfa1882e48c4d8
Parents: fe262ca
Author: Daan Hoogland <da...@onecht.net>
Authored: Tue Jan 28 15:44:04 2014 +0100
Committer: Daan Hoogland <dh...@schubergphilis.com>
Committed: Tue Jan 28 15:44:04 2014 +0100
----------------------------------------------------------------------
server/src/com/cloud/acl/DomainChecker.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/44bc2beb/server/src/com/cloud/acl/DomainChecker.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/acl/DomainChecker.java b/server/src/com/cloud/acl/DomainChecker.java
index 2e43da3..31b273f 100755
--- a/server/src/com/cloud/acl/DomainChecker.java
+++ b/server/src/com/cloud/acl/DomainChecker.java
@@ -307,7 +307,9 @@ public class DomainChecker extends AdapterBase implements SecurityChecker {
}
}
//didn't find in upper tree
- if (zoneDomainRecord.getPath().contains(accountDomainRecord.getPath())) {
+ if (zoneDomainRecord != null &&
+ accountDomainRecord != null &&
+ zoneDomainRecord.getPath().contains(accountDomainRecord.getPath())) {
return true;
}
}