From commits-return-26562-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Wed Jul 14 23:42:38 2010 Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 87277 invoked from network); 14 Jul 2010 23:42:37 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 14 Jul 2010 23:42:37 -0000 Received: (qmail 18825 invoked by uid 500); 14 Jul 2010 23:42:37 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 18760 invoked by uid 500); 14 Jul 2010 23:42:37 -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 18753 invoked by uid 99); 14 Jul 2010 23:42:37 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Jul 2010 23:42:37 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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, 14 Jul 2010 23:42:35 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2D68423889B1; Wed, 14 Jul 2010 23:41:42 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r964261 - /directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/FilterParser.java Date: Wed, 14 Jul 2010 23:41:42 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100714234142.2D68423889B1@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Wed Jul 14 23:41:41 2010 New Revision: 964261 URL: http://svn.apache.org/viewvc?rev=964261&view=rev Log: Deal with NotFilter correctly Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/FilterParser.java Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/FilterParser.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/FilterParser.java?rev=964261&r1=964260&r2=964261&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/FilterParser.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/FilterParser.java Wed Jul 14 23:41:41 2010 @@ -668,6 +668,12 @@ public class FilterParser { // Add the child to the node children branchNode.addNode( child ); + + if ( branchNode instanceof NotNode ) + { + return node; + } + nbChildren++; } else if ( node instanceof AndNode )