Merged V2.1 to HEAD:

6556: AVM performance tweaks
   6557: WCM-758.
   6558: Fixes WCM-753.
   6559: better handling of rename, copy and paste for form instance data and renditions.  addresses WCM-752 and partially addresses WCM-559.
   6560: Renamed JndiTest.java until we decide to keep it or not.
   6561: Oops.
   6562: probable fix WCM-669      
   6563: Build fix after the removal of flushing suport 
   6564: Fix for WCM-728
   6566: Support for avm index clustering via tracking - WCM-762
   6567: Test fix after flush changes
   6568: Fixed AWC-1517: Can now create space based on existing top-level space
   6569: misc IE fixes.
   6570: Various changes to improve AVM import performance and submit performance.
   6571: Session flushing is now deprecated and doesn't fail with an exception.
   6572: Reduced the iteration count to stress nextResults calls a bit more
   6573: WS query sessions put back into cache after more results have been fetched.
   6574: AR-1347: RepositoryServiceSoapBindingStub.queryAssociated() returns nothing when direction=target
   6575: Fixed AR-1680: XPath metadata extraction now handles Node, NodeList and String return values
   6577: Fix for AWC-1518 (User Homes renaming issue, and unreported issue with client config overriding of users home location)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6745 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/search/AVMSnapShotTriggeredIndexingMethodInterceptor.java

@@ -469,6 +469,7 @@ public class AVMSnapShotTriggeredIndexingMethodInterceptor implements MethodInte
         if (indexer instanceof AVMLuceneIndexer)
         {
             AVMLuceneIndexer avmIndexer = (AVMLuceneIndexer) indexer;
+            avmIndexer.flushPending();
             return avmIndexer.hasIndexBeenCreated(store);
         }
         return false;

source/java/org/alfresco/repo/search/impl/lucene/AVMLuceneIndexerImpl.java

@@ -1545,16 +1545,30 @@ public class AVMLuceneIndexerImpl extends AbstractLuceneIndexerImpl<String> impl
         }
     }
 
+    
     public boolean hasIndexBeenCreated(String store)
     {
-        IndexReader mainReader = null;
+        return hasIndexBeenCreatedimpl(store, IndexChannel.MAIN) || hasIndexBeenCreatedimpl(store, IndexChannel.DELTA);
+    }
+    
+    public boolean hasIndexBeenCreatedimpl(String store, IndexChannel channel)
+    {
+        IndexReader reader = null;
         try
         {
-            mainReader = getReader();
+            if (channel == IndexChannel.DELTA)
+            {
+                flushPending();
+                reader = getDeltaReader();
+            }
+            else
+            {
+                reader = getReader();
+            }
             TermDocs termDocs = null;
             try
             {
-                termDocs = mainReader.termDocs(new Term("ISROOT", "T"));
+                termDocs = reader.termDocs(new Term("ISROOT", "T"));
                 return termDocs.next();
             }
             finally
@@ -1573,9 +1587,17 @@ public class AVMLuceneIndexerImpl extends AbstractLuceneIndexerImpl<String> impl
         {
             try
             {
-                if (mainReader != null)
+
+                if (reader != null)
                 {
-                    mainReader.close();
+                    if (channel == IndexChannel.DELTA)
+                    {
+                        closeDeltaReader();
+                    }
+                    else
+                    {
+                        reader.close();
+                    }
                 }
             }
             catch (IOException e)