Merge branch 'stable-2.14'

* stable-2.14:
  Add missing "_" to a caller of LuceneVersionManager.getDir
  Set version to 2.14.1-SNAPSHOT

Change-Id: I55ed5b4c85c15ea8e7f0745c1a90da6571b225a9
This commit is contained in:
David Pursehouse
2017-05-26 20:55:16 +09:00

View File

@@ -74,7 +74,7 @@ public class LuceneVersionManager extends AbstractVersionManager implements Life
TreeMap<Integer, AbstractVersionManager.Version<V>> versions = new TreeMap<>();
for (Schema<V> schema : def.getSchemas().values()) {
// This part is Lucene-specific.
Path p = getDir(sitePaths, def.getName(), schema);
Path p = getDir(sitePaths, def.getName() + "_", schema);
boolean isDir = Files.isDirectory(p);
if (Files.exists(p) && !isDir) {
log.warn("Not a directory: %s", p.toAbsolutePath());