From commits-return-22872-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Wed Sep 02 00:04:32 2009 Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 67983 invoked from network); 2 Sep 2009 00:04:31 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 2 Sep 2009 00:04:31 -0000 Received: (qmail 38902 invoked by uid 500); 2 Sep 2009 00:04:31 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 38843 invoked by uid 500); 2 Sep 2009 00:04:31 -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 38834 invoked by uid 99); 2 Sep 2009 00:04:31 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Sep 2009 00:04:31 +0000 X-ASF-Spam-Status: No, hits=-1999.6 required=10.0 tests=ALL_TRUSTED,SUBJECT_FUZZY_TION 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, 02 Sep 2009 00:04:30 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id EE0E52388903; Wed, 2 Sep 2009 00:04:09 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r810313 - /directory/apacheds/branches/apacheds-schema/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java Date: Wed, 02 Sep 2009 00:04:09 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090902000409.EE0E52388903@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Wed Sep 2 00:04:09 2009 New Revision: 810313 URL: http://svn.apache.org/viewvc?rev=810313&view=rev Log: Added a check against null MatchingRule passed to the initTables() method Modified: directory/apacheds/branches/apacheds-schema/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java Modified: directory/apacheds/branches/apacheds-schema/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java?rev=810313&r1=810312&r2=810313&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java (original) +++ directory/apacheds/branches/apacheds-schema/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java Wed Sep 2 00:04:09 2009 @@ -42,6 +42,8 @@ import java.io.File; import java.io.IOException; +import javax.naming.NamingException; + /** * A Jdbm based index implementation. @@ -195,6 +197,7 @@ * * @throws IOException if we cannot initialize the forward and reverse * tables + * @throws NamingException */ private void initTables() throws IOException { @@ -202,6 +205,11 @@ MatchingRule mr = attribute.getEquality(); + if ( mr == null ) + { + throw new IOException( "No Equality MatchingRule available for attribute " + attribute.getName() ); + } + comp = new SerializableComparator( mr.getOid() ); /*