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 2012/06/25 18:36:11 UTC
svn commit: r1353644 -
/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java
Author: elecharny
Date: Mon Jun 25 16:36:11 2012
New Revision: 1353644
URL: http://svn.apache.org/viewvc?rev=1353644&view=rev
Log:
Fixed some more potential errors when modifying some indexed attributes without normalization
Modified:
directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java
Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java?rev=1353644&r1=1353643&r2=1353644&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java Mon Jun 25 16:36:11 2012
@@ -1218,7 +1218,7 @@ public abstract class AbstractBTreeParti
{
for ( Value<?> value : mods )
{
- objectClassIdx.add( value.getString(), id );
+ objectClassIdx.add( (String)value.getNormValue(), id );
}
}
else if ( hasUserIndexOn( attributeType ) )
@@ -1282,12 +1282,12 @@ public abstract class AbstractBTreeParti
// value index entries and add new ones
for ( Value<?> value : entry.get( OBJECT_CLASS_AT ) )
{
- objectClassIdx.drop( value.getString(), id );
+ objectClassIdx.drop( (String)value.getNormValue(), id );
}
for ( Value<?> value : mods )
{
- objectClassIdx.add( value.getString(), id );
+ objectClassIdx.add( (String)value.getNormValue(), id );
}
}
else if ( hasUserIndexOn( attributeType ) )
@@ -1379,14 +1379,14 @@ public abstract class AbstractBTreeParti
{
for ( Value<?> objectClass : entry.get( OBJECT_CLASS_AT ) )
{
- objectClassIdx.drop( objectClass.getString(), id );
+ objectClassIdx.drop( (String)objectClass.getNormValue(), id );
}
}
else
{
for ( Value<?> value : mods )
{
- objectClassIdx.drop( value.getString(), id );
+ objectClassIdx.drop( (String)value.getNormValue(), id );
}
}
}
@@ -1407,7 +1407,7 @@ public abstract class AbstractBTreeParti
{
for ( Value<?> value : mods )
{
- ( ( Index ) index ).drop( value.getValue(), id );
+ ( ( Index ) index ).drop( value.getNormValue(), id );
}
}