From commits-return-34467-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Tue Sep 11 10:51:14 2012 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 800A3DD8B for ; Tue, 11 Sep 2012 10:51:14 +0000 (UTC) Received: (qmail 5057 invoked by uid 500); 11 Sep 2012 10:51:14 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 4926 invoked by uid 500); 11 Sep 2012 10:51:11 -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 4889 invoked by uid 99); 11 Sep 2012 10:51:10 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Sep 2012 10:51:10 +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; Tue, 11 Sep 2012 10:51:07 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D87F82388900 for ; Tue, 11 Sep 2012 10:50:23 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1383346 - in /directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src: main/java/org/apache/directory/server/core/partition/impl/btree/ main/java/org/apache/directory/server/xdbm/ test/java/org/apache/directory/server/xdbm/ Date: Tue, 11 Sep 2012 10:50:23 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120911105023.D87F82388900@eris.apache.org> Author: elecharny Date: Tue Sep 11 10:50:23 2012 New Revision: 1383346 URL: http://svn.apache.org/viewvc?rev=1383346&view=rev Log: o Removed the ReverseIndexEntry class, we don't use it anymore o The IndexCursorAdaptor just use the FowardIndexEntry from now on Removed: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ReverseIndexEntry.java directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/ReverseIndexEntryTest.java Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexCursorAdaptor.java Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexCursorAdaptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexCursorAdaptor.java?rev=1383346&r1=1383345&r2=1383346&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexCursorAdaptor.java (original) +++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexCursorAdaptor.java Tue Sep 11 10:50:23 2012 @@ -25,7 +25,6 @@ import java.util.Iterator; import org.apache.directory.server.xdbm.AbstractIndexCursor; import org.apache.directory.server.xdbm.ForwardIndexEntry; import org.apache.directory.server.xdbm.IndexEntry; -import org.apache.directory.server.xdbm.ReverseIndexEntry; import org.apache.directory.shared.i18n.I18n; import org.apache.directory.shared.ldap.model.cursor.ClosureMonitor; import org.apache.directory.shared.ldap.model.cursor.Cursor; @@ -49,7 +48,6 @@ public class IndexCursorAdaptor exten @SuppressWarnings("unchecked") final Cursor wrappedCursor; final ForwardIndexEntry forwardEntry; - final ReverseIndexEntry reverseEntry; /** @@ -65,16 +63,7 @@ public class IndexCursorAdaptor exten { this.wrappedCursor = wrappedCursor; - if ( forwardIndex ) - { - forwardEntry = new ForwardIndexEntry(); - reverseEntry = null; - } - else - { - forwardEntry = null; - reverseEntry = new ReverseIndexEntry(); - } + forwardEntry = new ForwardIndexEntry(); LOG_CURSOR.debug( "Creating IndexCursorAdaptor {}", this ); } @@ -143,18 +132,10 @@ public class IndexCursorAdaptor exten @SuppressWarnings("unchecked") public IndexEntry get() throws Exception { - if ( forwardEntry != null ) - { - Tuple tuple = wrappedCursor.get(); - forwardEntry.setTuple( tuple ); - return forwardEntry; - } - else - { - Tuple tuple = wrappedCursor.get(); - reverseEntry.setTuple( tuple ); - return reverseEntry; - } + Tuple tuple = wrappedCursor.get(); + forwardEntry.setTuple( tuple ); + + return forwardEntry; }