From 8aeb83d1c98ad6498dadfb32aedf50856e70c47e Mon Sep 17 00:00:00 2001
From: Jan Vonka <jan.vonka@alfresco.com>
Date: Thu, 1 Apr 2010 11:23:33 +0000
Subject: [PATCH] Merged V3.2 to HEAD     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
---
 .../impl/lucene/AVMLuceneIndexerImpl.java     | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/source/java/org/alfresco/repo/search/impl/lucene/AVMLuceneIndexerImpl.java b/source/java/org/alfresco/repo/search/impl/lucene/AVMLuceneIndexerImpl.java
index bb56753207..fcb51cf957 100644
--- a/source/java/org/alfresco/repo/search/impl/lucene/AVMLuceneIndexerImpl.java
+++ b/source/java/org/alfresco/repo/search/impl/lucene/AVMLuceneIndexerImpl.java
@@ -271,12 +271,23 @@ public class AVMLuceneIndexerImpl extends AbstractLuceneIndexerImpl<String> impl
                 // New
                 if (srcDesc == null)
                 {
-                    index(difference.getDestinationPath());
-                    if (dstDesc.isDirectory())
+                    if (dstDesc == null)
                     {
-                        indexDirectory(dstDesc);
+                        // 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());
+                        if (dstDesc.isDirectory())
+                        {
+                            indexDirectory(dstDesc);
+                        }
+                        reindexAllAncestors(difference.getDestinationPath());
                     }
-                    reindexAllAncestors(difference.getDestinationPath());
                 }
                 // New Delete
                 else if (!srcDesc.isDeleted() && ((dstDesc == null) || dstDesc.isDeleted()))
@@ -291,6 +302,10 @@ public class AVMLuceneIndexerImpl extends AbstractLuceneIndexerImpl<String> impl
                     if ((dstDesc == null) || dstDesc.isDeleted())
                     {
                         // 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
                     {