You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2009/06/17 23:24:57 UTC
svn commit: r785810 - in
/directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm:
JdbmStore.java JdbmTable.java
Author: elecharny
Date: Wed Jun 17 21:24:55 2009
New Revision: 785810
URL: http://svn.apache.org/viewvc?rev=785810&view=rev
Log:
Fixed DIRSERVER-1376
Modified:
directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java
directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java
Modified: directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java?rev=785810&r1=785809&r2=785810&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java Wed Jun 17 21:24:55 2009
@@ -1263,6 +1263,7 @@
tempId = getParentId( tempId );
}
+ // making entry an ancestor/descendent of itself in sublevel index
subLevelIdx.add( id, id );
// Now work on the user defined userIndices
@@ -1328,7 +1329,7 @@
entryCsnIdx.drop( id );
entryUuidIdx.drop( id );
- if( parentId != 1 )// should not use getParentId() to compare, onelevel index drops the 'id'
+ if( id != 1 )
{
subLevelIdx.drop( id );
}
Modified: directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java?rev=785810&r1=785809&r2=785810&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java Wed Jun 17 21:24:55 2009
@@ -600,7 +600,6 @@
{
return;
}
-
if ( set.getSize() > numDupLimit )
{
BTree tree = convertToBTree( set );