Index: apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/BTreeContextPartition.java
===================================================================
--- apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/BTreeContextPartition.java	(Revision 265035)
+++ apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/BTreeContextPartition.java	(Arbeitskopie)
@@ -177,9 +177,13 @@
             }
         }
         
-        add( cfg.getSuffix(),
+	// add entry for context, if it does not exist
+	if ( getSuffixEntry() == null ) 
+	{
+            add( cfg.getSuffix(),
                 cfg.getNormalizedSuffix( factoryCfg.getGlobalRegistries().getMatchingRuleRegistry() ),
                 cfg.getContextEntry() );
+	}
     }