Bug 507597 - Incompatible index should not be reported as error
Change-Id: I7a4c2d888052ab080ca8101da0ec678d379fded5
Signed-off-by: Sopot Cela <scela@redhat.com>
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/PluginIndex.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/PluginIndex.java
index ddacba5..9e9134c 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/PluginIndex.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/PluginIndex.java
@@ -21,8 +21,10 @@
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Status;
import org.eclipse.help.internal.base.HelpBasePlugin;
import org.eclipse.help.internal.base.util.ProxyUtil;
import org.eclipse.help.internal.util.ResourceLocator;
@@ -148,10 +150,11 @@
.getProperty(SearchIndex.DEPENDENCIES_KEY_LUCENE);
String analyzer = prop
.getProperty(SearchIndex.DEPENDENCIES_KEY_ANALYZER);
- if (!targetIndex.isLuceneCompatible(lucene)
- || !targetIndex.isAnalyzerCompatible(analyzer)) {
- HelpBasePlugin.logError("Error trying to consume Lucene index from bundle " + bundle.toString() //$NON-NLS-1$
- + ". Please use an index built with Lucene 6.1 or higher.", null); //$NON-NLS-1$
+ if (!targetIndex.isLuceneCompatible(lucene) || !targetIndex.isAnalyzerCompatible(analyzer)) {
+ String message = "Unable to consume Lucene index from bundle '" + bundle.toString() //$NON-NLS-1$
+ + "'. The index should be rebuilt with Lucene 6.1."; //$NON-NLS-1$
+ Status warningStatus = new Status(IStatus.WARNING, HelpBasePlugin.PLUGIN_ID, IStatus.OK, message, null);
+ HelpBasePlugin.logStatus(warningStatus);
return false;
}
} catch (MalformedURLException mue) {
