[exo-jcr-commits] exo-jcr SVN: r1161 - jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene.

[do-not-reply at jboss.org]

Author: nzamosenchuk
Date: 2009-12-24 05:46:32 -0500 (Thu, 24 Dec 2009)
New Revision: 1161

Modified:
   jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiIndex.java
Log:
EXOJCR-327: Fixed multiIndex to set itself to IndexInfos in constructor.

Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiIndex.java
===================================================================
--- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiIndex.java	2009-12-24 10:41:54 UTC (rev 1160)
+++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiIndex.java	2009-12-24 10:46:32 UTC (rev 1161)
@@ -241,10 +241,8 @@
       this.flushTask = null;
       this.indexNames = indexInfos;
       this.indexNames.setDirectory(indexDir);
-      if (indexNames.exists())
-      {
-         indexNames.read();
-      }
+      this.indexNames.setMultiIndex(this);
+      this.indexNames.read();
 
       // as of 1.5 deletable file is not used anymore
       removeDeletable();
@@ -2448,10 +2446,7 @@
       IndexInfos newIndexNames = new IndexInfos();
       newIndexNames.setMultiIndex(this);
       newIndexNames.setDirectory(indexDir);
-      if (newIndexNames.exists())
-      {
-         newIndexNames.read();
-      }
+      newIndexNames.read();
       // prepare added/removed sets
       Set<String> removed = new HashSet<String>(indexNames.getNames());
       removed.removeAll(newIndexNames.getNames());
@@ -2510,6 +2505,8 @@
          // prepare added/removed sets
          Set<String> newList = new HashSet<String>(indexNames.getNames());
 
+         log.info("GOT NEW LIST: "+newList);
+         
          // remove removed indexes
          Iterator<PersistentIndex> iterator = indexes.iterator();
          while (iterator.hasNext())