From 6812223a4e5c528e7d66a7eee1d5b1a6f61dbd4b Mon Sep 17 00:00:00 2001
From: Andrew Hind <andy.hind@alfresco.com>
Date: Fri, 7 Apr 2006 09:31:42 +0000
Subject: [PATCH] Fix index bug where deletes at the end if the current TX are
 not seen

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2633 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../search/impl/lucene/LuceneIndexerImpl.java |  3 ++
 .../repo/search/impl/lucene/LuceneTest.java   | 44 ++++++++++++++++++-
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/source/java/org/alfresco/repo/search/impl/lucene/LuceneIndexerImpl.java b/source/java/org/alfresco/repo/search/impl/lucene/LuceneIndexerImpl.java
index f639054115..80258c6883 100644
--- a/source/java/org/alfresco/repo/search/impl/lucene/LuceneIndexerImpl.java
+++ b/source/java/org/alfresco/repo/search/impl/lucene/LuceneIndexerImpl.java
@@ -919,6 +919,9 @@ public class LuceneIndexerImpl extends LuceneBase implements LuceneIndexer
                     throw new LuceneIndexException("Filed to close main reader", e);
                 }
             }
+            // Make sure deletes are sent
+            closeDeltaReader();
+            // Make sure writes and updates are sent.
             closeDeltaWriter();
         }
     }
diff --git a/source/java/org/alfresco/repo/search/impl/lucene/LuceneTest.java b/source/java/org/alfresco/repo/search/impl/lucene/LuceneTest.java
index ac1b3b5539..c714412eec 100644
--- a/source/java/org/alfresco/repo/search/impl/lucene/LuceneTest.java
+++ b/source/java/org/alfresco/repo/search/impl/lucene/LuceneTest.java
@@ -3025,7 +3025,28 @@ public class LuceneTest extends TestCase
         runBaseTests();
 
         serviceRegistry.getNodeService().deleteNode(n1);
-        serviceRegistry.getNodeService().createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN,
+        
+        
+        sp = new SearchParameters();
+        sp.addStore(rootNodeRef.getStoreRef());
+        sp.setLanguage(SearchService.LANGUAGE_LUCENE);
+        sp.setQuery("PATH:\"//.\"");
+        sp.excludeDataInTheCurrentTransaction(false);
+        results = serviceRegistry.getSearchService().query(sp);
+        assertEquals(5, results.length());
+        results.close();
+
+        sp = new SearchParameters();
+        sp.addStore(rootNodeRef.getStoreRef());
+        sp.setLanguage(SearchService.LANGUAGE_LUCENE);
+        sp.setQuery("PATH:\"//.\"");
+        sp.excludeDataInTheCurrentTransaction(true);
+        results = serviceRegistry.getSearchService().query(sp);
+        assertEquals(15, results.length());
+        results.close();
+        
+        
+        NodeRef created = serviceRegistry.getNodeService().createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN,
                 QName.createQName("{namespace}texas"), testSuperType).getChildRef();
 
         sp = new SearchParameters();
@@ -3046,6 +3067,27 @@ public class LuceneTest extends TestCase
         assertEquals(15, results.length());
         results.close();
 
+        serviceRegistry.getNodeService().deleteNode(created);
+        
+        
+        sp = new SearchParameters();
+        sp.addStore(rootNodeRef.getStoreRef());
+        sp.setLanguage(SearchService.LANGUAGE_LUCENE);
+        sp.setQuery("PATH:\"//.\"");
+        sp.excludeDataInTheCurrentTransaction(false);
+        results = serviceRegistry.getSearchService().query(sp);
+        assertEquals(5, results.length());
+        results.close();
+
+        sp = new SearchParameters();
+        sp.addStore(rootNodeRef.getStoreRef());
+        sp.setLanguage(SearchService.LANGUAGE_LUCENE);
+        sp.setQuery("PATH:\"//.\"");
+        sp.excludeDataInTheCurrentTransaction(true);
+        results = serviceRegistry.getSearchService().query(sp);
+        assertEquals(15, results.length());
+        results.close();
+        
         tx.rollback();
 
         sp = new SearchParameters();