Author: elecharny Date: Thu Mar 29 17:09:20 2012 New Revision: 1306998 URL: http://svn.apache.org/viewvc?rev=1306998&view=rev Log: o Minor refactoring Modified: directory/apacheds/branches/index-work/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndex.java directory/apacheds/branches/index-work/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java Modified: directory/apacheds/branches/index-work/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndex.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/index-work/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndex.java?rev=1306998&r1=1306997&r2=1306998&view=diff ============================================================================== --- directory/apacheds/branches/index-work/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndex.java (original) +++ directory/apacheds/branches/index-work/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndex.java Thu Mar 29 17:09:20 2012 @@ -106,6 +106,7 @@ public class JdbmRdnIndex extends Jdb // finally write a text file in the format -.txt FileWriter fw = new FileWriter( new File( path + "-" + attributeType.getName() + ".txt" ) ); + // write the AttributeType description fw.write( attributeType.toString() ); fw.close(); @@ -160,6 +161,7 @@ public class JdbmRdnIndex extends Jdb public void drop( ParentIdAndRdn rdn, Long id ) throws Exception { long val = forward.get( rdn ); + if ( val == id ) { forward.remove( rdn ); Modified: directory/apacheds/branches/index-work/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/index-work/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java?rev=1306998&r1=1306997&r2=1306998&view=diff ============================================================================== --- directory/apacheds/branches/index-work/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java (original) +++ directory/apacheds/branches/index-work/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java Thu Mar 29 17:09:20 2012 @@ -315,6 +315,7 @@ public class JdbmTable extends Abs } DupsContainer values = getDupsContainer( ( byte[] ) bt.find( key ) ); + if ( values.isArrayTree() ) { ArrayTree set = values.getArrayTree();