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

Merged V3.2 to HEAD

Browse Source 
19524: Fix AVM indexing NPE when running AVMCrawlTestP (if src & dst are both deleted / not there)
    19652: ALF-885 - fix test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19726 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2010-04-01 11:23:33 +00:00
parent f51ff31bbc
commit 8aeb83d1c9
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -270,6 +270,16 @@ public class AVMLuceneIndexerImpl extends AbstractLuceneIndexerImpl<String> impl
AVMNodeDescriptor dstDesc = avmService.lookup(difference.getDestinationVersion(), difference.getDestinationPath(), true); AVMNodeDescriptor dstDesc = avmService.lookup(difference.getDestinationVersion(), difference.getDestinationPath(), true);
// New // New
if (srcDesc == null) if (srcDesc == null)
{
if (dstDesc == null)
{
// Nothing to do for this case - both are deleted/not there
if (s_logger.isDebugEnabled())
{
s_logger.debug("Skipped - src & dst deleted / not there: "+difference);
}
}
else
{ {
index(difference.getDestinationPath()); index(difference.getDestinationPath());
if (dstDesc.isDirectory()) if (dstDesc.isDirectory())
@@ -278,6 +288,7 @@ public class AVMLuceneIndexerImpl extends AbstractLuceneIndexerImpl<String> impl
} }
reindexAllAncestors(difference.getDestinationPath()); reindexAllAncestors(difference.getDestinationPath());
} }
}
// New Delete // New Delete
else if (!srcDesc.isDeleted() && ((dstDesc == null) || dstDesc.isDeleted())) else if (!srcDesc.isDeleted() && ((dstDesc == null) || dstDesc.isDeleted()))
{ {
@@ -291,6 +302,10 @@ public class AVMLuceneIndexerImpl extends AbstractLuceneIndexerImpl<String> impl
if ((dstDesc == null) || dstDesc.isDeleted()) if ((dstDesc == null) || dstDesc.isDeleted())
{ {
// Nothing to do for this case - both are deleted/not there // Nothing to do for this case - both are deleted/not there
if (s_logger.isDebugEnabled())
{
s_logger.debug("Skipped - src & dst deleted / not there: "+difference);
}
} }
else else
{ {