Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 82119 invoked from network); 7 Jun 2010 15:21:12 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 7 Jun 2010 15:21:12 -0000 Received: (qmail 28838 invoked by uid 500); 7 Jun 2010 15:21:12 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 28781 invoked by uid 500); 7 Jun 2010 15:21:12 -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 28774 invoked by uid 99); 7 Jun 2010 15:21:12 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Jun 2010 15:21:12 +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; Mon, 07 Jun 2010 15:21:10 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D4EA623889F7; Mon, 7 Jun 2010 15:20:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r952265 - /directory/apacheds/trunk/jdbm/src/main/java/jdbm/btree/BTree.java Date: Mon, 07 Jun 2010 15:20:48 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100607152048.D4EA623889F7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Mon Jun 7 15:20:46 2010 New Revision: 952265 URL: http://svn.apache.org/viewvc?rev=952265&view=rev Log: Reverted a wrong check on the keySerializer. Modified: directory/apacheds/trunk/jdbm/src/main/java/jdbm/btree/BTree.java Modified: directory/apacheds/trunk/jdbm/src/main/java/jdbm/btree/BTree.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm/src/main/java/jdbm/btree/BTree.java?rev=952265&r1=952264&r2=952265&view=diff ============================================================================== --- directory/apacheds/trunk/jdbm/src/main/java/jdbm/btree/BTree.java (original) +++ directory/apacheds/trunk/jdbm/src/main/java/jdbm/btree/BTree.java Mon Jun 7 15:20:46 2010 @@ -55,13 +55,13 @@ import java.io.Serializable; import java.util.Comparator; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.directory.server.i18n.I18n; - import jdbm.RecordManager; import jdbm.helper.Serializer; import jdbm.helper.Tuple; import jdbm.helper.TupleBrowser; +import org.apache.directory.server.i18n.I18n; + /** * B+Tree persistent indexing data structure. B+Trees are optimized for @@ -206,12 +206,12 @@ public class BTree implements Exte throw new IllegalArgumentException( I18n.err( I18n.ERR_519 ) ); } - if ( keySerializer != null ) + if ( ( keySerializer != null ) && ! ( keySerializer instanceof Serializable ) ) { throw new IllegalArgumentException( I18n.err( I18n.ERR_520 ) ); } - if ( valueSerializer != null && !( valueSerializer instanceof Serializable ) ) + if ( ( valueSerializer != null ) && !( valueSerializer instanceof Serializable ) ) { throw new IllegalArgumentException( I18n.err( I18n.ERR_521 ) ); }