Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C513010A9E for ; Wed, 29 Jan 2014 08:54:03 +0000 (UTC) Received: (qmail 54320 invoked by uid 500); 29 Jan 2014 08:54:02 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 53923 invoked by uid 500); 29 Jan 2014 08:54:01 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 48275 invoked by uid 99); 29 Jan 2014 08:53:38 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Jan 2014 08:53:38 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 079BC90E889; Wed, 29 Jan 2014 08:53:37 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: girish@apache.org To: commits@cloudstack.apache.org Date: Wed, 29 Jan 2014 08:54:01 -0000 Message-Id: <8af95e9c4a1b4faf8cfa9a6b922163f7@git.apache.org> In-Reply-To: <1ffdbb021f814f6aaa01f5d1ff83609f@git.apache.org> References: <1ffdbb021f814f6aaa01f5d1ff83609f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [26/50] git commit: updated refs/heads/marvin to df58f51 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 Authored: Tue Jan 28 15:44:04 2014 +0100 Committer: Daan Hoogland 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; } }