Author: thomasm
Date: Wed Nov 9 15:23:57 2016
New Revision: 1768986
URL: http://svn.apache.org/viewvc?rev=1768986&view=rev
Log:
OAK-2072 Lucene: inconsistent usage of the config option "persistence"
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/IndexWriterUtils.java
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/IndexWriterUtils.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/IndexWriterUtils.java?rev=1768986&r1=1768985&r2=1768986&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/IndexWriterUtils.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/IndexWriterUtils.java
Wed Nov 9 15:23:57 2016
@@ -38,6 +38,8 @@ import org.apache.lucene.index.SerialMer
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.FSDirectory;
+import static
org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.PERSISTENCE_FILE;
+import static
org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.PERSISTENCE_NAME;
import static
org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.PERSISTENCE_PATH;
import static
org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.VERSION;
import static org.apache.lucene.store.NoLockFactory.getNoLockFactory;
@@ -72,7 +74,11 @@ public class IndexWriterUtils {
public static Directory newIndexDirectory(IndexDefinition indexDefinition,
NodeBuilder definition, String dirName)
throws IOException {
- String path = definition.getString(PERSISTENCE_PATH);
+ String path = null;
+ if (LuceneIndexConstants.PERSISTENCE_FILE.equalsIgnoreCase(
+ definition.getString(LuceneIndexConstants.PERSISTENCE_NAME))) {
+ path = definition.getString(PERSISTENCE_PATH);
+ }
if (path == null) {
return new OakDirectory(definition, dirName, indexDefinition,
false);
} else {
