cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gir...@apache.org
Subject [26/50] git commit: updated refs/heads/marvin to df58f51
Date Wed, 29 Jan 2014 08:54:01 GMT
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/marvin
Commit: 44bc2beb143992b10ad9a92642dfa1882e48c4d8
Parents: fe262ca
Author: Daan Hoogland <daan@onecht.net>
Authored: Tue Jan 28 15:44:04 2014 +0100
Committer: Daan Hoogland <dhoogland@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;
                     }
                 }


Mime
View raw message