From commits-return-33003-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Fri Dec 2 18:07:13 2011 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 B64FA9B29 for ; Fri, 2 Dec 2011 18:07:13 +0000 (UTC) Received: (qmail 77122 invoked by uid 500); 2 Dec 2011 18:07:13 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 77092 invoked by uid 500); 2 Dec 2011 18:07:13 -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 77085 invoked by uid 99); 2 Dec 2011 18:07:13 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Dec 2011 18:07:13 +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; Fri, 02 Dec 2011 18:07:12 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 7D53723888E7 for ; Fri, 2 Dec 2011 18:06:51 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1209611 - /directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/SchemaPartition.java Date: Fri, 02 Dec 2011 18:06:51 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111202180651.7D53723888E7@eris.apache.org> Author: elecharny Date: Fri Dec 2 18:06:51 2011 New Revision: 1209611 URL: http://svn.apache.org/viewvc?rev=1209611&view=rev Log: Fixed a NPE in the search request Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/SchemaPartition.java Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/SchemaPartition.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/SchemaPartition.java?rev=1209611&r1=1209610&r2=1209611&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/SchemaPartition.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/SchemaPartition.java Fri Dec 2 18:06:51 2011 @@ -52,11 +52,14 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.model.exception.LdapException; import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException; import org.apache.directory.shared.ldap.model.exception.LdapUnwillingToPerformException; +import org.apache.directory.shared.ldap.model.filter.ExprNode; +import org.apache.directory.shared.ldap.model.filter.PresenceNode; import org.apache.directory.shared.ldap.model.message.SearchRequest; import org.apache.directory.shared.ldap.model.message.SearchRequestImpl; import org.apache.directory.shared.ldap.model.message.SearchScope; import org.apache.directory.shared.ldap.model.message.controls.Cascade; import org.apache.directory.shared.ldap.model.name.Dn; +import org.apache.directory.shared.ldap.model.schema.AttributeType; import org.apache.directory.shared.ldap.model.schema.SchemaManager; import org.apache.directory.shared.ldap.model.schema.SchemaUtils; import org.apache.directory.shared.util.DateUtils; @@ -124,6 +127,9 @@ public final class SchemaPartition exten /** A static Dn for the ou=schema partition */ private static Dn SCHEMA_DN; + /** The ObjectClass AttributeType */ + private static AttributeType OBJECT_CLASS_AT; + public SchemaPartition( SchemaManager schemaManager ) { @@ -139,6 +145,7 @@ public final class SchemaPartition exten id = SCHEMA_ID; suffixDn = SCHEMA_DN; this.schemaManager = schemaManager; + OBJECT_CLASS_AT = schemaManager.getAttributeType( SchemaConstants.OBJECT_CLASS_AT_OID ); } @@ -293,7 +300,8 @@ public final class SchemaPartition exten Dn dn = deleteContext.getDn(); SearchRequest searchRequest = new SearchRequestImpl(); searchRequest.setBase( dn ); - searchRequest.setFilter( "ObjectClass=*)" ); + ExprNode node = new PresenceNode( OBJECT_CLASS_AT ); + searchRequest.setFilter( node ); searchRequest.setTypesOnly( true ); searchRequest.setScope( SearchScope.ONELEVEL );