Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-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 6704710237 for ; Wed, 8 May 2013 13:25:22 +0000 (UTC) Received: (qmail 38728 invoked by uid 500); 8 May 2013 13:25:22 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 38665 invoked by uid 500); 8 May 2013 13:25:22 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 38657 invoked by uid 99); 8 May 2013 13:25:21 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 May 2013 13:25:21 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED 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; Wed, 08 May 2013 13:25:19 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 480E3238897D; Wed, 8 May 2013 13:24:58 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1480268 - /directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/LeafNode.java Date: Wed, 08 May 2013 13:24:58 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130508132458.480E3238897D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Wed May 8 13:24:56 2013 New Revision: 1480268 URL: http://svn.apache.org/r1480268 Log: Throw a NPE if we try to create a LeafNode with a null Attribute (DIRSERVER-1707) Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/LeafNode.java Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/LeafNode.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/LeafNode.java?rev=1480268&r1=1480267&r2=1480268&view=diff ============================================================================== --- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/LeafNode.java (original) +++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/LeafNode.java Wed May 8 13:24:56 2013 @@ -28,7 +28,7 @@ import org.apache.directory.api.ldap.mod * * @author Apache Directory Project */ -public class LeafNode extends AbstractExprNode +public abstract class LeafNode extends AbstractExprNode { /** attributeType on which this leaf is based */ protected AttributeType attributeType; @@ -53,6 +53,10 @@ public class LeafNode extends AbstractEx this.attribute = attributeType.getName(); isSchemaAware = true; } + else + { + throw new NullPointerException( "Cannot create a Node with a null Attribute" ); + } }