directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1532190 - /directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java
Date Tue, 15 Oct 2013 05:23:22 GMT
Author: elecharny
Date: Tue Oct 15 05:23:22 2013
New Revision: 1532190

URL: http://svn.apache.org/r1532190
Log:
Fix for DIRSERVER-1906

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=1532190&r1=1532189&r2=1532190&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
Tue Oct 15 05:23:22 2013
@@ -717,12 +717,13 @@ public abstract class AbstractBTreeParti
 
             for ( Value<?> value : objectClass )
             {
-                if ( value.equals( SchemaConstants.TOP_OC ) )
+                String valueStr = ( String ) value.getNormValue();
+
+                if ( valueStr.equals( SchemaConstants.TOP_OC ) )
                 {
                     continue;
                 }
 
-                String valueStr = ( String ) value.getNormValue();
                 objectClassIdx.add( valueStr, id );
             }
 
@@ -1141,12 +1142,12 @@ public abstract class AbstractBTreeParti
             if ( entry != null )
             {
                 entry.setDn( dn );
-                
+
                 entry = new ClonedServerEntry( entry );
 
                 // Replace the entry's DN with the provided one
                 Attribute entryDnAt = entry.get( ENTRY_DN_AT );
-                
+
                 if ( entryDnAt == null )
                 {
                     entry.add( ENTRY_DN_AT, dn.getName() );
@@ -1177,9 +1178,9 @@ public abstract class AbstractBTreeParti
 
                 // always store original entry in the cache
                 addToCache( id, entry );
-                
+
                 entry = new ClonedServerEntry( entry );
-                
+
                 if ( !entry.containsAttribute( ENTRY_DN_AT ) )
                 {
                     entry.add( ENTRY_DN_AT, dn.getName() );



Mime
View raw message