Merged V2.2 to HEAD

11053: Reinstate transaction count for FULL index recover
   11055: Build fix
   11056: Fix bug/Build - finding deleted people
   11057: Clean any people that should not be there at the start of the tests ..
   11063: Throw detailed failure message when Authority list size is incorrect
   11075: Build fix
   11145: Fixed FK index name


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@11222 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2008-10-06 23:32:49 +00:00
parent ad23a594f5
commit c5f08a8f06
6 changed files with 37 additions and 13 deletions

View File

@@ -1868,7 +1868,7 @@ public class IndexInfo
File location = new File(indexDirectory, id).getCanonicalFile();
if (IndexReader.indexExists(location))
{
if (size > config.getMaxDocsForInMemoryMerge())
if ((config != null) && (size > config.getMaxDocsForInMemoryMerge()))
{
reader = IndexReader.open(location);
}