inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V2.9 to HEAD

Browse Source 
9231: Merged V2.2 to V2.9
      9207: Merged V2.1 to V2.2
         9124: Class behaviour compilation doesn't throw exceptions for missing model class definitions.
         9125: Part-fix for ACT-2935: AVMSyncException during index rebuild in AVM
         9171: Improvements to I18N freemarker template message() method as supplied by Will Abson
         9202: Additional servlet mappings added to example NTLM auth section in web.xml


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9235 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2008-05-22 14:18:45 +00:00
parent 6e225ce15d
commit 4714ef8d46
3 changed files with 62 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/java/org/alfresco/repo/search/impl/lucene/AVMLuceneIndexerImpl.java
View File

@@ -62,6 +62,7 @@ import org.alfresco.service.cmr.avm.AVMException;
import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
import org.alfresco.service.cmr.avm.AVMService;
import org.alfresco.service.cmr.avmsync.AVMDifference;
import org.alfresco.service.cmr.avmsync.AVMSyncException;
import org.alfresco.service.cmr.avmsync.AVMSyncService;
import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
import org.alfresco.service.cmr.dictionary.PropertyDefinition;
@@ -246,7 +247,20 @@ public class AVMLuceneIndexerImpl extends AbstractLuceneIndexerImpl<String> impl
s_logger.debug("Sync index for " + store + " from " + srcVersion + " to " + dstVersion);
}
String path = store + ":/";
List<AVMDifference> changeList = avmSyncService.compare(srcVersion, path, dstVersion, path, null);
List<AVMDifference> changeList = null;
try
{
changeList = avmSyncService.compare(srcVersion, path, dstVersion, path, null);
}
catch (AVMSyncException e)
{
s_logger.warn("\n" +
"Unable to generate change list for synchronous indexing: \n" +
" Store: " + store + "\n" +
" Start version: " + srcVersion + "\n" +
" End version: " + endVersion);
return;
}
for (AVMDifference difference : changeList)
{
switch (difference.getDifferenceCode())