Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 28301 invoked from network); 26 Sep 2005 06:37:51 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 26 Sep 2005 06:37:51 -0000 Received: (qmail 41615 invoked by uid 500); 26 Sep 2005 06:37:51 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 41591 invoked by uid 500); 26 Sep 2005 06:37:51 -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 41577 invoked by uid 99); 26 Sep 2005 06:37:51 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 25 Sep 2005 23:37:51 -0700 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Sun, 25 Sep 2005 23:37:58 -0700 Received: (qmail 28271 invoked by uid 65534); 26 Sep 2005 06:37:30 -0000 Message-ID: <20050926063730.28270.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r291569 - /directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/ACDFEngine.java Date: Mon, 26 Sep 2005 06:37:29 -0000 To: commits@directory.apache.org From: trustin@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: trustin Date: Sun Sep 25 23:37:25 2005 New Revision: 291569 URL: http://svn.apache.org/viewcvs?rev=291569&view=rev Log: Used PresenceNode instead of FilterParser. Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/ACDFEngine.java Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/ACDFEngine.java URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/ACDFEngine.java?rev=291569&r1=291568&r2=291569&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/ACDFEngine.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/ACDFEngine.java Sun Sep 25 23:37:25 2005 @@ -38,7 +38,7 @@ import org.apache.ldap.common.aci.ProtectedItem.RestrictedByItem; import org.apache.ldap.common.exception.LdapNoPermissionException; import org.apache.ldap.common.filter.ExprNode; -import org.apache.ldap.common.filter.FilterParserImpl; +import org.apache.ldap.common.filter.PresenceNode; import org.apache.ldap.common.name.LdapName; import org.apache.ldap.common.subtree.SubtreeSpecification; import org.apache.ldap.server.event.Evaluator; @@ -67,16 +67,8 @@ refinementEvaluator = new RefinementEvaluator( new RefinementLeafEvaluator( oidRegistry ) ); - try - { - childrenFilter = new FilterParserImpl().parse( "(objectClass=*)" ); - } - catch( Exception e ) - { - throw ( NamingException ) new NamingException( - "Failed to initialize a children filter." ).initCause( e ); - } + childrenFilter = new PresenceNode( "objectClass" ); childrenSearchControls = new SearchControls(); childrenSearchControls.setSearchScope( SearchControls.ONELEVEL_SCOPE ); }