[exo-jcr-commits] exo-jcr SVN: r5856 - jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene.

[do-not-reply at jboss.org]

Author: nzamosenchuk
Date: 2012-03-13 08:27:52 -0400 (Tue, 13 Mar 2012)
New Revision: 5856

Modified:
   jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SearchIndex.java
Log:
EXOJCR-1805 : adding DocNumberRecoveryFilter if noone configured

Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SearchIndex.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SearchIndex.java	2012-03-13 11:23:12 UTC (rev 5855)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SearchIndex.java	2012-03-13 12:27:52 UTC (rev 5856)
@@ -84,16 +84,7 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.security.PrivilegedAction;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.CountDownLatch;
 
 import javax.jcr.RepositoryException;
@@ -525,7 +516,7 @@
     */
    protected boolean isSuspended = false;
 
-   protected Set<String> recoveryFilterClasses = new HashSet<String>();
+   protected final Set<String> recoveryFilterClasses;
 
    protected List<AbstractRecoveryFilter> recoveryFilters = null;
 
@@ -547,6 +538,7 @@
       this.cfm = cfm;
       SearchIndexConfigurationHelper searchIndexConfigurationHelper = new SearchIndexConfigurationHelper(this);
       searchIndexConfigurationHelper.init(queryHandlerConfig);
+      this.recoveryFilterClasses = new LinkedHashSet<String>();
    }
 
    /**
@@ -569,6 +561,7 @@
       this.analyzer = new JcrStandartAnalyzer();
       this.cfm = null;
       this.wsId = null;
+      this.recoveryFilterClasses = new LinkedHashSet<String>();
    }
 
    /**
@@ -761,6 +754,11 @@
       {
          recoveryFilters = new ArrayList<AbstractRecoveryFilter>();
          log.info("Initializing RecoveryFilters.");
+         // add default filter, if none configured.
+         if (recoveryFilterClasses.isEmpty())
+         {
+            this.recoveryFilterClasses.add(DocNumberRecoveryFilter.class.getName());
+         }
          for (String recoveryFilterClassName : recoveryFilterClasses)
          {
             AbstractRecoveryFilter filter = null;