Removed unnecessary definition that is already in core.schema.

[openldap] / servers / slapd / back-ldbm / id2entry.c

diff --git a/servers/slapd/back-ldbm/id2entry.c b/servers/slapd/back-ldbm/id2entry.c
index 58de12b7c7ebfa4d4d014f95059f1b6fa4bff2a6..8c4d8b14095f1bcad2f5ce6989dfa0edc594b56a 100644 (file)
--- a/servers/slapd/back-ldbm/id2entry.c
+++ b/servers/slapd/back-ldbm/id2entry.c
@@ -145,7 +145,7 @@ id2entry_rw( Backend *be, ID id, int rw )
        ldbm_cache_close( be, db );
 
        if ( e == NULL ) {
-               Debug( LDAP_DEBUG_TRACE, "<= id2entry_%s( %ld )  (failed)\n",
+               Debug( LDAP_DEBUG_TRACE, "<= id2entry_%s( %ld ) (failed)\n",
                        rw ? "w" : "r", id, 0 );
                return( NULL );
        }
@@ -158,9 +158,20 @@ id2entry_rw( Backend *be, ID id, int rw )
        }
 
        if( cache_add_entry_rw( &li->li_cache, e, rw ) != 0 ) {
+               entry_free( e );
+
+               /* XXX this is a kludge.
+                * maybe the entry got added underneath us
+                * There are many underlying race condtions in the cache/disk code.
+                */
+               if ( (e = cache_find_entry_id( &li->li_cache, id, rw )) != NULL ) {
+                       Debug( LDAP_DEBUG_TRACE, "<= id2entry_%s( %ld ) 0x%lx (cache)\n",
+                               rw ? "w" : "r", id, (unsigned long) e );
+                       return( e );
+               }
+
                Debug( LDAP_DEBUG_TRACE, "<= id2entry_%s( %ld ) (cache add failed)\n",
                        rw ? "w" : "r", id, 0 );
-               entry_free( e );
                return NULL;
        }