From commits-return-6253-apmail-jackrabbit-commits-archive=jackrabbit.apache.org@jackrabbit.apache.org Tue Sep 02 17:23:28 2008 Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 99616 invoked from network); 2 Sep 2008 17:23:26 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Sep 2008 17:23:26 -0000 Received: (qmail 28925 invoked by uid 500); 2 Sep 2008 17:23:24 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 28891 invoked by uid 500); 2 Sep 2008 17:23:24 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 28881 invoked by uid 99); 2 Sep 2008 17:23:24 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Sep 2008 10:23:24 -0700 X-ASF-Spam-Status: No, hits=-1998.9 required=10.0 tests=ALL_TRUSTED,FB_GET_MEDS X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Sep 2008 17:22:34 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 401B7238899E; Tue, 2 Sep 2008 10:23:05 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r691324 - /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/EffectiveNodeType.java Date: Tue, 02 Sep 2008 17:23:04 -0000 To: commits@jackrabbit.apache.org From: jukka@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080902172305.401B7238899E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jukka Date: Tue Sep 2 10:23:04 2008 New Revision: 691324 URL: http://svn.apache.org/viewvc?rev=691324&view=rev Log: JCR-1308: Unnecessary null check in EffectiveNodeType.getApplicableChildNodeDef() Applied improvement suggested by Ed Burnette. Also simplified the control flow statements a bit without introducing functional changes. Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/EffectiveNodeType.java Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/EffectiveNodeType.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/EffectiveNodeType.java?rev=691324&r1=691323&r2=691324&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/EffectiveNodeType.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/EffectiveNodeType.java Tue Sep 2 10:23:04 2008 @@ -686,25 +686,20 @@ // try named node definitions first ItemDef[] defs = getNamedItemDefs(name); - if (defs != null) { - for (int i = 0; i < defs.length; i++) { - ItemDef def = defs[i]; - if (def.definesNode()) { - NodeDef nd = (NodeDef) def; - // node definition with that name exists - if (entTarget != null && nd.getRequiredPrimaryTypes() != null) { - // check 'required primary types' constraint - if (!entTarget.includesNodeTypes(nd.getRequiredPrimaryTypes())) { - continue; - } + for (int i = 0; i < defs.length; i++) { + if (defs[i].definesNode()) { + NodeDef nd = (NodeDef) defs[i]; + Name[] types = nd.getRequiredPrimaryTypes(); + // node definition with that name exists + if (entTarget != null && types != null) { + // check 'required primary types' constraint + if (entTarget.includesNodeTypes(types)) { // found named node definition return nd; - } else { - if (nd.getDefaultPrimaryType() != null) { - // found node definition with default node type - return nd; - } } + } else if (nd.getDefaultPrimaryType() != null) { + // found node definition with default node type + return nd; } } }