X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.db.indexing%2Fsrc%2Forg%2Fsimantics%2Fdb%2Findexing%2FIndexedRelationsSearcherBase.java;h=c2a7befad6e2723304b920dfc3b689c2551506e9;hb=d9361204e6d61f7defb3fb350d3751fd2c21956a;hp=74d3299018553d1d37f3539ee5fd91cdd6f77dd6;hpb=55be1eddbfed0d3d9e9e95a7d2547e287fde84ca;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.db.indexing/src/org/simantics/db/indexing/IndexedRelationsSearcherBase.java b/bundles/org.simantics.db.indexing/src/org/simantics/db/indexing/IndexedRelationsSearcherBase.java
index 74d329901..c2a7befad 100644
--- a/bundles/org.simantics.db.indexing/src/org/simantics/db/indexing/IndexedRelationsSearcherBase.java
+++ b/bundles/org.simantics.db.indexing/src/org/simantics/db/indexing/IndexedRelationsSearcherBase.java
@@ -340,6 +340,7 @@ abstract public class IndexedRelationsSearcherBase {
                     removedTerm = new Term(key, (String) keyValue);
                 } else {
                     // FIXME: should throw an exception for illegal input data but this would leave the index in an incoherent state
+                    getLogger().error("Attempting to remove document from index of {} with key {} and unrecognized key value type {} : {}", input, key, keyValue, keyValue != null ? keyValue.getClass() : "null");
                     continue;
                 }
 
@@ -426,7 +427,7 @@ abstract public class IndexedRelationsSearcherBase {
                     boolean done = false;
                     if(requireChangeInfoOnReplace()) {
 	                    TopDocs exist = searcher.search(new TermQuery(removedTerm), null, 2);
-	                    if(exist.scoreDocs.length == 1 && requireChangeInfoOnReplace()) {
+	                    if(exist.scoreDocs.length == 1) {
 	                    	Document doc = reader.document(exist.scoreDocs[0].doc);
 	                    	if(!areSame(doc, document)) {
 	                            writer.deleteDocuments(removedTerm);
@@ -624,7 +625,7 @@ abstract public class IndexedRelationsSearcherBase {
                     mon.subTask("Erasing previous index");
                     if (getLogger().isDebugEnabled())
                         getLogger().debug("Erasing previous index {}", indexPath.toAbsolutePath());
-                    FileUtils.delete(indexPath);
+                    FileUtils.emptyDirectory(indexPath);
                 }
             }