[exo-jcr-commits] exo-jcr SVN: r4938 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query.

[do-not-reply at jboss.org]

Author: nzamosenchuk
Date: 2011-09-22 09:33:13 -0400 (Thu, 22 Sep 2011)
New Revision: 4938

Modified:
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SearchManager.java
Log:
EXOJCR-1493 : Fix asynch JMX reindexing for System Search Manager.

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SearchManager.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SearchManager.java	2011-09-22 09:01:22 UTC (rev 4937)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SearchManager.java	2011-09-22 13:33:13 UTC (rev 4938)
@@ -521,7 +521,7 @@
       if (itemStates.getSize() > 0)
       {
          //Check if SearchManager started and filter configured
-         if (changesFilter != null)
+         if (changesFilter != null && parentSearchManager!=null)
          {
             changesFilter.onSaveItems(itemStates);
          }
@@ -951,6 +951,7 @@
          if (parentSearchManager != null)
          {
             changesFilter = initializeChangesFilter();
+            parentSearchManager.setChangesFilter(changesFilter);
          }
       }
       catch (SecurityException e)
@@ -984,6 +985,20 @@
    }
 
    /**
+    * Inserts the instance of {@link IndexerChangesFilter} into the {@link SearchManager}. 
+    * Used to set instance for {@link SystemSearchManager}.
+    * 
+    * @param changesFilter
+    */
+   protected void setChangesFilter(IndexerChangesFilter changesFilter)
+   {
+      if (this.changesFilter == null)
+      {
+         this.changesFilter = changesFilter;
+      }
+   }
+
+   /**
     * @param query
     * @return
     * @throws RepositoryException
@@ -1598,7 +1613,7 @@
    {
       try
       {
-         File backupDir = new File((File) context.getObject(DataRestoreContext.STORAGE_DIR), getStorageName());
+         File backupDir = new File((File)context.getObject(DataRestoreContext.STORAGE_DIR), getStorageName());
 
          if (!PrivilegedFileHelper.exists(backupDir))
          {